public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcryptui: fix build with gnupg22

Browse Source
This commit is contained in:
ajs124 2020-07-22 00:13:40 +02:00
parent 7cce31c5e2
commit 3026bfc4d9
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/libcryptui/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gnome3, gtk3, gnupg20, gpgme, dbus-glib, libgnome-keyring }: { stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libcryptui"; pname = "libcryptui";
@ -9,8 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski"; sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; patches = [
buildInputs = [ glib gtk3 gnupg20 gpgme dbus-glib libgnome-keyring ]; ./fix-gnupg-2.2.patch # based on https://gitlab.gnome.org/GNOME/libcryptui/-/commit/b05e301d1b264a5d8f07cb96e5edc243d99bff79.patch
];
nativeBuildInputs = [ pkgconfig intltool autoreconfHook ];
buildInputs = [ glib gtk3 gnupg22 gpgme dbus-glib libgnome-keyring ];
propagatedBuildInputs = [ dbus-glib ]; propagatedBuildInputs = [ dbus-glib ];
passthru = { passthru = {

26
pkgs/development/libraries/libcryptui/fix-gnupg-2.2.patch Normal file
View File

@ -0,0 +1,26 @@
From b05e301d1b264a5d8f07cb96e5edc243d99bff79 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
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