From ab62b7e9b9c05498cd5e2d9f2521a3d51d5aeedf Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 12 Sep 2017 12:23:53 +0300 Subject: [PATCH] Revert "libgcrypt: Add pre-ARMv7 patch" This reverts commit 1cfe9539f99d4d0f9dd00a48f79d13e8a37b4d08. No longer needed after the upgrade in 095af3e63b26e4. --- pkgs/development/libraries/libgcrypt/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 8d71cfd313d..e32ba050c38 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/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; @@ -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 = ''