diff --git a/pkgs/development/libraries/libcryptui/debian-patches.nix b/pkgs/development/libraries/libcryptui/debian-patches.nix new file mode 100644 index 000000000000..d9114aecc770 --- /dev/null +++ b/pkgs/development/libraries/libcryptui/debian-patches.nix @@ -0,0 +1,26 @@ +# Generated by debian-patches.sh from debian-patches.txt +let + prefix = "https://sources.debian.org/data/main/libc/libcryptui/3.12.2-8/debian/patches"; +in +[ + { + url = "${prefix}/build-use-pkg-config-to-detect-gpgme.patch"; + sha256 = "1kvp30qrnnhnjma8vgi3acvjn74fzig1mdmkxn6xbdz2vj12wwns"; + } + { + url = "${prefix}/daemon-fix-conflicting-return-types.patch"; + sha256 = "1iqr58v1rmykq2z48sniixfvq2v0qaifdfihkq6is2a711fkigxp"; + } + { + url = "${prefix}/daemon-port-to-gcr-3.patch"; + sha256 = "1j1nbh03m4cqymhqiamndn3gmi7bdzv0srr90nhlgjhszmyg150g"; + } + { + url = "${prefix}/git_allow-gpg2-2.1.patch"; + sha256 = "1g93psg0cki4wnyymc59wchzhas3qqja7y46rbzdksp5wmfl51ap"; + } + { + url = "${prefix}/libcryptui-fix-logic-flaw-in-the-prompt-recipients-d.patch"; + sha256 = "1qnd6j2zk8gssj2fgrgikc05ccdv7sqabprykzxix7v8827sa56j"; + } +] diff --git a/pkgs/development/libraries/libcryptui/debian-patches.txt b/pkgs/development/libraries/libcryptui/debian-patches.txt new file mode 100644 index 000000000000..575274ebf425 --- /dev/null +++ b/pkgs/development/libraries/libcryptui/debian-patches.txt @@ -0,0 +1,6 @@ +libcryptui/3.12.2-8 +build-use-pkg-config-to-detect-gpgme.patch +daemon-fix-conflicting-return-types.patch +daemon-port-to-gcr-3.patch +git_allow-gpg2-2.1.patch +libcryptui-fix-logic-flaw-in-the-prompt-recipients-d.patch diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index a32a03de103c..5a476aeba795 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, autoreconfHook, gettext, pkg-config, @@ -13,7 +14,7 @@ gnupg, gpgme, dbus-glib, - libgnome-keyring, + gcr, }: stdenv.mkDerivation rec { @@ -25,10 +26,12 @@ stdenv.mkDerivation rec { sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski"; }; - patches = [ - # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch - # https://gitlab.gnome.org/GNOME/libcryptui/-/merge_requests/1 - ./fix-latest-gnupg.patch + patches = (lib.map fetchurl (import ./debian-patches.nix)) ++ [ + # Fix build with gpgme 2.0 + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libcryptui/-/raw/1-3.12.2+r71+ged4f890e-2/gpgme-2.0.patch"; + hash = "sha256-yftIixqVGUqn/VP0tfzPnhLPI7A/m61kVY5P1NDTIqQ="; + }) ]; nativeBuildInputs = [ @@ -45,7 +48,7 @@ stdenv.mkDerivation rec { gnupg gpgme dbus-glib - libgnome-keyring + gcr ]; propagatedBuildInputs = [ dbus-glib ]; diff --git a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch b/pkgs/development/libraries/libcryptui/fix-latest-gnupg.patch deleted file mode 100644 index 19aa27b549c2..000000000000 --- a/pkgs/development/libraries/libcryptui/fix-latest-gnupg.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 2.3 2.4" - AC_PATH_PROGS(GNUPG, [gpg gpg2], no) - AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.]) - ok="no" --- -GitLab -