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

pinentry: fix build /cc wkennington

Browse Source
This commit is contained in:
Domen Kožar 2015-03-26 10:07:05 +01:00
parent 61e573fcb6
commit 8feda47bee
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
(mkWith (libcap != null) "libcap") (mkWith (libcap != null) "libcap")
(mkWith (hasX) "x")
(mkEnable (ncurses != null) "pinentry-curses") (mkEnable (ncurses != null) "pinentry-curses")
(mkEnable true "pinentry-tty") (mkEnable true "pinentry-tty")
(mkEnable (gtk2 != null) "pinentry-gtk2") (mkEnable (gtk2 != null) "pinentry-gtk2")
@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
homepage = "http://gnupg.org/aegypten2/"; homepage = "http://gnupg.org/aegypten2/";
description = "GnuPG's interface to passphrase input"; description = "GnuPG's interface to passphrase input";
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
longDescription = '' longDescription = ''
Pinentry provides a console and a GTK+ GUI that allows users to Pinentry provides a console and a GTK+ GUI that allows users to
enter a passphrase when `gpg' or `gpg2' is run and needs it. enter a passphrase when `gpg' or `gpg2' is run and needs it.

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

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

1
pkgs/top-level/release.nix
View File

@ -147,7 +147,6 @@ let
pciutils = linux; pciutils = linux;
pdf2xml = all; pdf2xml = all;
php = linux; php = linux;
pinentry = linux;
pltScheme = linux; pltScheme = linux;
pmccabe = linux; pmccabe = linux;
ppl = all; ppl = all;