From af6c270b6df187ca123d54cf28955341854fedd3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 8 Jun 2015 09:25:58 -0500 Subject: [PATCH] pinentry: find moc when qt4 enabled --- pkgs/tools/security/pinentry/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 757959f5345..b4ff0b77f38 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 ]; }; }