about summary refs log tree commit diff
path: root/pkgs/development/libraries/libgcrypt
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2021-03-07 12:19:20 +0000
committerJörg Thalheim <joerg@thalheim.io>2021-03-07 12:20:03 +0000
commitac95a1f4cbd91c212a3a7913e125a24884c97a8c (patch)
tree1fee0e7729079753542c4c1f3550266f5f482ed6 /pkgs/development/libraries/libgcrypt
parent65cddb74d7408da1c2dd19782bd1ae997e2f3a82 (diff)
downloadnixlib-ac95a1f4cbd91c212a3a7913e125a24884c97a8c.tar
nixlib-ac95a1f4cbd91c212a3a7913e125a24884c97a8c.tar.gz
nixlib-ac95a1f4cbd91c212a3a7913e125a24884c97a8c.tar.bz2
nixlib-ac95a1f4cbd91c212a3a7913e125a24884c97a8c.tar.lz
nixlib-ac95a1f4cbd91c212a3a7913e125a24884c97a8c.tar.xz
nixlib-ac95a1f4cbd91c212a3a7913e125a24884c97a8c.tar.zst
nixlib-ac95a1f4cbd91c212a3a7913e125a24884c97a8c.zip
libgcrypt: remove upstreamed patch
Diffstat (limited to 'pkgs/development/libraries/libgcrypt')
-rw-r--r--pkgs/development/libraries/libgcrypt/default.nix13
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index a129704897bd..6b761d2170c3 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -1,6 +1,4 @@
-{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap
-, buildPackages, fetchpatch
-}:
+{ lib, stdenv, fetchurl, gettext, libgpgerror, enableCapabilities ? false, libcap, buildPackages }:
 
 assert enableCapabilities -> stdenv.isLinux;
 
@@ -13,15 +11,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ssENCRUTsnHkcXcnRgex/7o9lbGIu/qHl/lIrskFPFo=";
   };
 
-  patches = [
-    # fix build on 32bit musl
-    (fetchpatch {
-      name = "fix_building_with_disable-asm_on_x86.patch";
-      url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff_plain;h=af23ab5c5482d625ff52e60606cf044e2b0106c8";
-      sha256 = "1m8apm8wra6fk89ggha4d0bba5absihm38zvb2khklqh9q5hj9jw";
-    })
-  ];
-
   outputs = [ "out" "dev" "info" ];
   outputBin = "dev";