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

Revert "Refactor mkFlag out of old packages"

Browse Source 
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
This commit is contained in:
Eelco Dolstra
2015-06-04 14:54:50 +02:00
parent 17b6a597fb
commit 5d8fe045b6
11 changed files with 202 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/pinentry/default.nix
+9 -6
View File
@@ -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 ];