diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-07-18 04:32:36 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2017-10-01 01:38:15 +0200 |
| commit | 75bf151d251e3dc03e3188991f36c482f6eeed7d (patch) | |
| tree | 6e63807671191244c25a2b7f10d40fe99664b95f /pkgs/tools/security/pinentry | |
| parent | 4ad98786a0dd5b87f0d200ec27c05e02fceee3b9 (diff) | |
| download | nixlib-75bf151d251e3dc03e3188991f36c482f6eeed7d.tar nixlib-75bf151d251e3dc03e3188991f36c482f6eeed7d.tar.gz nixlib-75bf151d251e3dc03e3188991f36c482f6eeed7d.tar.bz2 nixlib-75bf151d251e3dc03e3188991f36c482f6eeed7d.tar.lz nixlib-75bf151d251e3dc03e3188991f36c482f6eeed7d.tar.xz nixlib-75bf151d251e3dc03e3188991f36c482f6eeed7d.tar.zst nixlib-75bf151d251e3dc03e3188991f36c482f6eeed7d.zip | |
pinentry: fix configure arguments
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.
Diffstat (limited to 'pkgs/tools/security/pinentry')
| -rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 51fd47141611..10a9d3504acc 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,7 +6,6 @@ let mkFlag = pfxTrue: pfxFalse: cond: name: "--${if cond then pfxTrue else pfxFalse}-${name}"; mkEnable = mkFlag "enable" "disable"; mkWith = mkFlag "with" "without"; - hasX = gtk2 != null || gcr != null || qt4 != null; in with stdenv.lib; stdenv.mkDerivation rec { @@ -40,12 +39,11 @@ stdenv.mkDerivation rec { configureFlags = [ (mkWith (libcap != null) "libcap") - (mkWith (hasX) "x") (mkEnable (ncurses != null) "pinentry-curses") (mkEnable true "pinentry-tty") (mkEnable (gtk2 != null) "pinentry-gtk2") (mkEnable (gcr != null) "pinentry-gnome3") - (mkEnable (qt4 != null) "pinentry-qt4") + (mkEnable (qt4 != null) "pinentry-qt") ]; nativeBuildInputs = [ pkgconfig ]; |