Pinentry 0.7.5.

svn path=/nixpkgs/trunk/; revision=13597
This commit is contained in:
Ludovic Courtès 2008-12-08 21:22:20 +00:00
parent e66080438b
commit 6d92197ffd
3 changed files with 40 additions and 11 deletions

View File

@ -1,17 +1,26 @@
args:
args.stdenv.mkDerivation {
name = "pinentry-0.7.2";
{ fetchurl, stdenv, glib, pkgconfig, gtk, ncurses }:
src = args.fetchurl {
url = http://gentoo.chem.wisc.edu/gentoo/distfiles/pinentry-0.7.2.tar.gz;
sha256 = "0s6n5n4bxg95rmwa3mw3r49dabf8yh6fkpfi8mbl7i85dgpibnzv";
stdenv.mkDerivation rec {
name = "pinentry-0.7.5";
src = fetchurl {
url = "mirror://gnupg/pinentry/${name}.tar.gz";
sha256 = "cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172";
};
buildInputs =(with args; [glib pkgconfig x11 gtk]);
patches = [ ./duplicate-glib-defs.patch ];
buildInputs = [ glib pkgconfig gtk ncurses ];
meta = {
description = "input interface for passwords needed by gnupg";
homepage = "don't know, gentoo lists http://www.gnupg.org/aegypten/";
license = "GPL2";
description = "GnuPG's interface to passphrase input";
longDescription = ''
Pinentry provides a console and a GTK+ GUI that allows users to
enter a passphrase when `gpg' or `gpg2' is run and needs it.
'';
homepage = http://gnupg.org/aegypten2/;
license = "GPLv2+";
};
}

View File

@ -0,0 +1,20 @@
Comment out definitions of functions that are part of Glib.
--- pinentry-0.7.5/gtk+-2/gtksecentry.c 2007-11-19 12:20:50.000000000 +0100
+++ pinentry-0.7.5/gtk+-2/gtksecentry.c 2008-12-08 22:08:22.000000000 +0100
@@ -269,6 +269,7 @@ gboolean g_use_secure_mem = FALSE;
} while(0)
+#if 0
gpointer
g_malloc(gulong size)
{
@@ -347,6 +348,7 @@ g_free(gpointer mem)
free(mem);
}
}
+#endif
GType
gtk_secure_entry_get_type(void)

View File

@ -1084,7 +1084,7 @@ let
};
pinentry = import ../tools/misc/pinentry {
inherit fetchurl stdenv pkgconfig x11;
inherit fetchurl stdenv pkgconfig ncurses;
inherit (gnome) glib gtk;
};