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

Upgrade pinentry to 0.8.0

Browse Source 
Also add optional pinentry-qt4

svn path=/nixpkgs/trunk/; revision=21882
This commit is contained in:
Yury G. Kudryashov 2010-05-19 20:58:35 +00:00
parent 0ff12ea30b
commit 7751f8bd62
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/misc/pinentry/default.nix
View File

@ -1,16 +1,21 @@
{ fetchurl, stdenv, glib, pkgconfig, gtk, ncurses }: { fetchurl, stdenv, pkgconfig, glib
, useGtk ? true, gtk ? null
, useNcurses ? true, ncurses ? null
, useQt4 ? false, qt4 ? null }:
assert useGtk -> (gtk != null);
assert useNcurses -> (ncurses != null);
assert useQt4 -> (qt4 != null);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pinentry-0.7.5"; name = "pinentry-0.8.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/pinentry/${name}.tar.gz"; url = "mirror://gnupg/pinentry/${name}.tar.gz";
sha256 = "cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172"; sha256 = "06phs3gbs6gf0z9g28z3jgsw312dhhpdgzrx4hhps53xrbwpyv22";
}; };
patches = [ ./duplicate-glib-defs.patch ]; buildInputs = [ glib pkgconfig gtk ncurses ] ++ stdenv.lib.optional useQt4 qt4;
buildInputs = [ glib pkgconfig gtk ncurses ];
meta = { meta = {
description = "GnuPG's interface to passphrase input"; description = "GnuPG's interface to passphrase input";

4
pkgs/top-level/all-packages.nix
View File

@ -1369,8 +1369,8 @@ let
inherit (xlibs) libX11; inherit (xlibs) libX11;
}; };
pinentry = import ../tools/misc/pinentry { pinentry = makeOverridable (import ../tools/misc/pinentry) {
inherit fetchurl stdenv pkgconfig ncurses; inherit fetchurl stdenv pkgconfig ncurses qt4;
inherit (gnome) glib gtk; inherit (gnome) glib gtk;
}; };