diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-07-21 20:12:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-07-21 20:12:38 +0200 |
| commit | 87cfb513c1454a2db75db9483d713eeca4341766 (patch) | |
| tree | 3c97e04e045201dc5e71aa4d49634f2e42b2f0c6 /pkgs | |
| parent | 78b21f405c46a059e9dabcb6fcc2d8e052e12746 (diff) | |
| download | nixpkgs-87cfb513c1454a2db75db9483d713eeca4341766.tar nixpkgs-87cfb513c1454a2db75db9483d713eeca4341766.tar.gz nixpkgs-87cfb513c1454a2db75db9483d713eeca4341766.tar.bz2 nixpkgs-87cfb513c1454a2db75db9483d713eeca4341766.tar.lz nixpkgs-87cfb513c1454a2db75db9483d713eeca4341766.tar.xz nixpkgs-87cfb513c1454a2db75db9483d713eeca4341766.tar.zst nixpkgs-87cfb513c1454a2db75db9483d713eeca4341766.zip | |
gpgme: apply the recent patch for all platforms
See commit 16105403b.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/gpgme/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index c8dad069dcc..e138c824a44 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -20,14 +20,12 @@ stdenv.mkDerivation rec { sha256 = "1l4yw9fqc1blvx1sq1jnfvp1jijla3ca2jw90p4x9m8hvfpc933c"; }; - patches = - # TODO: apply unconditionally on a rebuild; probably included in > 1.16.0 - lib.optional (stdenv.is32bit && stdenv.isLinux) (fetchpatch { + patches = [ + (fetchpatch { # probably included in > 1.16.0 name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969"; sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h"; }) - ++ [ (fetchpatch { # gpg: Send --with-keygrip when listing keys name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; |