diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 21:29:47 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:50 +0200 |
| commit | 5d8fe045b6376851c33a1c772cfe46882411cd21 (patch) | |
| tree | 6f80e10e2ec11cfed92207ef87082a4ae3e1666e /pkgs/tools/security/pinentry | |
| parent | 17b6a597fb36063e4832983d3470ce695f809b31 (diff) | |
| download | nixlib-5d8fe045b6376851c33a1c772cfe46882411cd21.tar nixlib-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.gz nixlib-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.bz2 nixlib-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.lz nixlib-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.xz nixlib-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.zst nixlib-5d8fe045b6376851c33a1c772cfe46882411cd21.zip | |
Revert "Refactor mkFlag out of old packages"
This reverts commit 3117e0c897522ec8431572de12449f676cc8c8be. Conflicts: pkgs/development/libraries/wayland/default.nix pkgs/servers/samba/4.x.nix
Diffstat (limited to 'pkgs/tools/security/pinentry')
| -rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 3849c773a3e6..757959f53451 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -3,6 +3,9 @@ }: let + mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; + mkEnable = mkFlag "enable" "disable"; + mkWith = mkFlag "with" "without"; hasX = gtk2 != null || qt4 != null; in with stdenv.lib; @@ -17,12 +20,12 @@ stdenv.mkDerivation rec { buildInputs = [ libcap gtk2 ncurses qt4 ]; configureFlags = [ - (mkWith (libcap != null) "libcap" null) - (mkWith (hasX) "x" null) - (mkEnable (ncurses != null) "pinentry-curses" null) - (mkEnable true "pinentry-tty" null) - (mkEnable (gtk2 != null) "pinentry-gtk2" null) - (mkEnable (qt4 != null) "pinentry-qt4" null) + (mkWith (libcap != null) "libcap") + (mkWith (hasX) "x") + (mkEnable (ncurses != null) "pinentry-curses") + (mkEnable true "pinentry-tty") + (mkEnable (gtk2 != null) "pinentry-gtk2") + (mkEnable (qt4 != null) "pinentry-qt4") ]; nativeBuildInputs = [ pkgconfig ]; |