From 7d733bbc862383dac8e33bc505aeb58eff0db65e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 4 Oct 2019 22:57:55 -0500 Subject: [PATCH] qtpass: point to lupdate --- pkgs/applications/misc/qtpass/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index dbeff8a6c171..d6b319e1abe1 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, mkDerivation, fetchFromGitHub +{ lib, mkDerivation, fetchFromGitHub , git, gnupg, pass, qtbase, qtsvg, qttools, qmake }: @@ -13,12 +13,17 @@ mkDerivation rec { sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08"; }; - buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; + buildInputs = [ git gnupg pass qtbase qtsvg ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake qttools ]; enableParallelBuilding = true; + qmakeFlags = [ + # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: + "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" + ]; + qtWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}" ]; @@ -28,7 +33,7 @@ mkDerivation rec { install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A multi-platform GUI for pass, the standard unix password manager"; homepage = https://qtpass.org; license = licenses.gpl3;