BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "libgcrypt: Add pre-ARMv7 patch"

Browse source 
This reverts commit 1cfe9539f9.

No longer needed after the upgrade in 095af3e63b.
This commit is contained in:
Tuomas Tynkkynen 2017-09-12 12:23:53 +03:00
parent 628b6c0e9d
commit ab62b7e9b9
1 changed files with 1 additions and 10 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, fetchpatch, libgpgerror, enableCapabilities ? false, libcap }:
{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:
assert enableCapabilities -> stdenv.isLinux;
@ -22,15 +22,6 @@ stdenv.mkDerivation rec {
buildInputs = [ libgpgerror ]
++ 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
# Also make sure includes are fixed for callers who don't use libgpgcrypt-config
postFixup = ''