Skip to content

Commit

Permalink
Revert "libgcrypt: Add pre-ARMv7 patch"
Browse files Browse the repository at this point in the history
This reverts commit 1cfe953.

No longer needed after the upgrade in 095af3e.
  • Loading branch information
dezgeg committed Sep 12, 2017
1 parent 628b6c0 commit ab62b7e
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions pkgs/development/libraries/libgcrypt/default.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, libgpgerror, enableCapabilities ? false, libcap }:
{ stdenv, fetchurl, libgpgerror, enableCapabilities ? false, libcap }:

assert enableCapabilities -> stdenv.isLinux;

Expand All @@ -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 = ''
Expand Down

0 comments on commit ab62b7e

Please sign in to comment.