diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-06-08 09:25:58 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-06-13 10:12:13 -0500 |
commit | af6c270b6df187ca123d54cf28955341854fedd3 (patch) | |
tree | 3d5fb18ed31e2c1f516252772f5c3871b11d6906 /pkgs | |
parent | 64a507bd9b5d29cb72ddc37c4e366c2708dcbba6 (diff) | |
download | nixlib-af6c270b6df187ca123d54cf28955341854fedd3.tar nixlib-af6c270b6df187ca123d54cf28955341854fedd3.tar.gz nixlib-af6c270b6df187ca123d54cf28955341854fedd3.tar.bz2 nixlib-af6c270b6df187ca123d54cf28955341854fedd3.tar.lz nixlib-af6c270b6df187ca123d54cf28955341854fedd3.tar.xz nixlib-af6c270b6df187ca123d54cf28955341854fedd3.tar.zst nixlib-af6c270b6df187ca123d54cf28955341854fedd3.zip |
pinentry: find moc when qt4 enabled
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 757959f53451..b4ff0b77f385 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ libcap gtk2 ncurses qt4 ]; + # configure cannot find moc on its own + preConfigure = stdenv.lib.optionalString (qt4 != null) '' + export QTDIR="${qt4}" + export MOC="${qt4}/bin/moc" + ''; + configureFlags = [ (mkWith (libcap != null) "libcap") (mkWith (hasX) "x") @@ -36,8 +42,9 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; longDescription = '' - Pinentry provides a console and a GTK+ GUI that allows users to - enter a passphrase when `gpg' or `gpg2' is run and needs it. + Pinentry provides a console and (optional) GTK+ and Qt GUIs allowing users + to enter a passphrase when `gpg' or `gpg2' is run and needs it. ''; + maintainers = [ stdenv.lib.maintainers.ttuegel ]; }; } |