From 2dae738752d1f19f862626bf38ead9ed4ff77fb4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 8 Jan 2022 14:32:05 +0100 Subject: libcryptui: fix build with latest gnupg --- pkgs/development/libraries/libcryptui/default.nix | 4 +++- .../libraries/libcryptui/fix-gnupg-2.2.patch | 26 ---------------------- .../libraries/libcryptui/fix-latest-gnupg.patch | 26 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch create mode 100644 pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index 00eca6e06776e..89b7dfa664442 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; patches = [ - ./fix-gnupg-2.2.patch # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch + # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch + # https://gitlab.gnome.org/GNOME/libcryptui/-/merge_requests/1 + ./fix-latest-gnupg.patch ]; nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; diff --git a/pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch b/pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch deleted file mode 100644 index 50d5e0c82c1c4..0000000000000 --- a/pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b05e301d1b264a5d8f07cb96e5edc243d99bff79 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Fri, 10 Nov 2017 08:55:55 +0100 -Subject: [PATCH] Accept GnuPG 2.2.x as supported version - -https://bugzilla.gnome.org/show_bug.cgi?id=790152 ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4486e7b2..be5b28b4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check, - DO_CHECK=$enableval, DO_CHECK=yes) - - if test "$DO_CHECK" = "yes"; then -- accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.2" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) - ok="no" --- -GitLab - diff --git a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch new file mode 100644 index 0000000000000..e12b584d16ebe --- /dev/null +++ b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch @@ -0,0 +1,26 @@ +From b05e301d1b264a5d8f07cb96e5edc243d99bff79 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Fri, 10 Nov 2017 08:55:55 +0100 +Subject: [PATCH] Accept GnuPG 2.2.x as supported version + +https://bugzilla.gnome.org/show_bug.cgi?id=790152 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 4486e7b2..be5b28b4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check, + DO_CHECK=$enableval, DO_CHECK=yes) + + if test "$DO_CHECK" = "yes"; then +- accepted_versions="1.2 1.4 2.0" ++ accepted_versions="1.2 1.4 2.0 2.2 2.3" + AC_PATH_PROGS(GNUPG, [gpg gpg2], no) + AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) + ok="no" +-- +GitLab + -- cgit 1.4.1