From ac95a1f4cbd91c212a3a7913e125a24884c97a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 7 Mar 2021 12:19:20 +0000 Subject: [PATCH] libgcrypt: remove upstreamed patch --- pkgs/development/libraries/libgcrypt/default.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index a129704897b..6b761d2170c 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";