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

pinentry: Fix for darwin

This commit is contained in:
William A. Kennington III 2015-03-25 16:19:02 -07:00
parent ba4330a89e
commit 70a8bfbcd5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/security/pinentry/default.nix
View File

@ -6,7 +6,7 @@ let
mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}";
mkEnable = mkFlag "enable" "disable"; mkEnable = mkFlag "enable" "disable";
mkWith = mkFlag "with" "without"; mkWith = mkFlag "with" "without";
hasX = gtk != null || qt4 != null; hasX = gtk2 != null || qt4 != null;
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

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

@ -2363,7 +2363,8 @@ let
philter = callPackage ../tools/networking/philter { }; philter = callPackage ../tools/networking/philter { };
pinentry = callPackage ../tools/security/pinentry { pinentry = callPackage ../tools/security/pinentry {
qt4 = null; gtk2 = !stdenv.isDarwin;
qt4 = stdenv.isDarwin;
}; };
pius = callPackage ../tools/security/pius { }; pius = callPackage ../tools/security/pius { };