From c5481bb1d8ba382451bf4fe0e98bcf95304596bd Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 7 Jun 2011 21:50:12 +0000 Subject: [PATCH] pinentry: make gtk UI really optional svn path=/nixpkgs/trunk/; revision=27381 --- pkgs/tools/misc/pinentry/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/pinentry/default.nix b/pkgs/tools/misc/pinentry/default.nix index 004f3afa9b7..b9866878b7a 100644 --- a/pkgs/tools/misc/pinentry/default.nix +++ b/pkgs/tools/misc/pinentry/default.nix @@ -1,11 +1,9 @@ { fetchurl, stdenv, pkgconfig, glib -, useGtk ? true, gtk ? null -, useNcurses ? true, ncurses ? null -, useQt4 ? false, qt4 ? null }: +, useGtk ? true, gtk +, useNcurses ? true, ncurses +, useQt4 ? false, qt4 }: -assert useGtk -> (gtk != null); -assert useNcurses -> (ncurses != null); -assert useQt4 -> (qt4 != null); +assert useGtk || useNcurses || useQt4; stdenv.mkDerivation rec { name = "pinentry-0.8.0"; @@ -15,7 +13,18 @@ stdenv.mkDerivation rec { sha256 = "06phs3gbs6gf0z9g28z3jgsw312dhhpdgzrx4hhps53xrbwpyv22"; }; - buildInputs = [ glib pkgconfig gtk ncurses ] ++ stdenv.lib.optional useQt4 qt4; + buildInputs = let opt = stdenv.lib.optional; in [] + ++ opt useGtk glib + ++ opt useGtk gtk + ++ opt useNcurses ncurses + ++ opt useQt4 qt4; + + configureFlags = [ "--disable-pinentry-gtk" "--disable-pinentry-qt" ] + ++ (if useGtk || useQt4 then ["--with-x"] else ["--without-x"]) + ++ (if useGtk then ["--enable-pinentry-gtk2"] else ["--disable-pinentry-gtk"]) + ++ (if useQt4 then ["--enable-pinentry-qt4"] else ["--disable-pinentry-qt4"]); + + buildNativeInputs = [ pkgconfig ]; meta = { description = "GnuPG's interface to passphrase input";