diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-01-08 14:32:05 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-01-08 14:32:05 +0100 |
| commit | 2dae738752d1f19f862626bf38ead9ed4ff77fb4 (patch) | |
| tree | 35eb48552f24dc2eeebb358448afc2282b1e2f7e | |
| parent | c1fac0a1c0361f697a345f8a408717becd6ad193 (diff) | |
libcryptui: fix build with latest gnupg
| -rw-r--r-- | pkgs/development/libraries/libcryptui/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch (renamed from pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch) | 2 |
2 files changed, 4 insertions, 2 deletions
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-latest-gnupg.patch index 50d5e0c82c1c4..e12b584d16ebe 100644 --- a/pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch +++ b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch @@ -17,7 +17,7 @@ index 4486e7b2..be5b28b4 100644 if test "$DO_CHECK" = "yes"; then - accepted_versions="1.2 1.4 2.0" -+ accepted_versions="1.2 1.4 2.0 2.2" ++ 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" |