chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade pinentry to 0.8.0

Browse Source 
Also add optional pinentry-qt4

svn path=/nixpkgs/branches/mass-update-01/; revision=21189
This commit is contained in:
Yury G. Kudryashov
2010-04-20 18:15:26 +00:00
parent 445a3e07e9
commit e7d5500adf
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,15 +1,20 @@
{ 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 {
name = "pinentry-0.7.5";
name = "pinentry-0.8.0";
src = fetchurl {
url = "mirror://gnupg/pinentry/${name}.tar.gz";
sha256 = "cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172";
sha256 = "06phs3gbs6gf0z9g28z3jgsw312dhhpdgzrx4hhps53xrbwpyv22";
};
patches = [ ./duplicate-glib-defs.patch ];
buildInputs = [ glib pkgconfig gtk ncurses ];
meta = {

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

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