b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libcryptui: fix build with latest gnupg

Browse source
This commit is contained in:
Jan Tojnar 2022-01-08 14:32:05 +01:00
parent c1fac0a1c0
commit 2dae738752
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libcryptui/default.nix
View file

@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
}; };
patches = [ 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 ]; nativeBuildInputs = [ pkg-config intltool autoreconfHook ];

2
pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch → pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch
View file

@ -17,7 +17,7 @@ index 4486e7b2..be5b28b4 100644
if test "$DO_CHECK" = "yes"; then if test "$DO_CHECK" = "yes"; then
- accepted_versions="1.2 1.4 2.0" - 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_PATH_PROGS(GNUPG, [gpg gpg2], no)
AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
ok="no" ok="no"