dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pinentry: fix configure arguments

Browse Source 
pinentry 0.9.6 changed the `qt4` flag to just `qt`. Additionally,
the `--with-x` option has not been there for a while. This commit
renames and removes the flags, respectively.
This commit is contained in:
Jan Tojnar 2017-07-18 04:32:36 +02:00
parent 4ad98786a0
commit 75bf151d25
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ 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 = gtk2 != null || gcr != null || qt4 != null;
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -40,12 +39,11 @@ 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")
(mkEnable (gcr != null) "pinentry-gnome3") (mkEnable (gcr != null) "pinentry-gnome3")
(mkEnable (qt4 != null) "pinentry-qt4") (mkEnable (qt4 != null) "pinentry-qt")
]; ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];