public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgcrypt: Add pre-ARMv7 patch

Browse Source 
Apparently the assembly-optimized functions use an opcode that doesn't
work on pre-ARMv7. Fix in next release.
This commit is contained in:
Tuomas Tynkkynen 2017-08-27 23:05:28 +03:00
parent 724504e0da
commit 1cfe9539f9
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libgcrypt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }: { stdenv, fetchurl, fetchpatch, libgpgerror, enableCapabilities ? false, libcap }:
assert enableCapabilities -> stdenv.isLinux; assert enableCapabilities -> stdenv.isLinux;
@ -22,6 +22,15 @@ stdenv.mkDerivation rec {
buildInputs = [ libgpgerror ] buildInputs = [ libgpgerror ]
++ stdenv.lib.optional enableCapabilities libcap; ++ stdenv.lib.optional enableCapabilities libcap;
# Shouldn't be needed after 1.8.1
patches = if stdenv.isArm && stdenv.system != "armv7l-linux"
then fetchpatch {
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=4a7aa30ae9f3ce798dd886c2f2d4164c43027748";
name = "arm.patch";
sha256 = "1dq9s0xwpbg7s5sghvssmwh4v88x733zm6c8ab3flllq8h7c8fq5";
}
else null;
# Make sure libraries are correct for .pc and .la files # Make sure libraries are correct for .pc and .la files
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
postFixup = '' postFixup = ''