From 6a99952795534be5a7a0610de80b83b2e1359e13 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 2 Apr 2020 06:35:36 +0200 Subject: [PATCH] gpgme: Fix tests with gnupg > 2.2.19 --- pkgs/development/libraries/gpgme/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ed2b5563bd3..9e5ff187ac6 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which, ncurses , texinfo , buildPackages @@ -20,6 +20,21 @@ stdenv.mkDerivation rec { sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4"; }; + patches = [ + # Fix tests with gnupg > 2.2.19 + # https://dev.gnupg.org/T4820 + (fetchpatch { + name = "cff600f1f65a2164ab25ff2b039cba008776ce62.patch"; + url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=cff600f1f65a2164ab25ff2b039cba008776ce62"; + sha256 = "9vB2aTv3zeAQS3UxCDfkRjqUlng8lkcyJPgMzdm+Qzc="; + }) + (fetchpatch { + name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; + url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; + sha256 = "pKL1tvUw7PB2w4FHSt2up4SvpFiprBH6TLdgKxYFC3g="; + }) + ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool