From a009dcdb2732ca914e13f3c9ae48a6e32adc5dce Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 4 Oct 2019 22:43:56 -0500 Subject: [PATCH 1/4] qtpass: 1.3.0 -> 1.3.1 https://github.com/IJHack/QtPass/releases/tag/v1.3.1 --- pkgs/applications/misc/qtpass/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 1fccada4200..dbeff8a6c17 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,31 +1,22 @@ -{ stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch +{ stdenv, lib, mkDerivation, fetchFromGitHub , git, gnupg, pass, qtbase, qtsvg, qttools, qmake }: mkDerivation rec { pname = "qtpass"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv"; + sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08"; }; buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; nativeBuildInputs = [ qmake ]; - # Fix missing app icon on Wayland. Has been upstreamed and should be safe to - # remove in versions > 1.3.0 - patches = [ - (fetchpatch { - url = "https://github.com/IJHack/QtPass/commit/aba8c4180f0ab3d66c44f88b21f137b19d17bde8.patch"; - sha256 = "009bcq0d75khmaligzd7736xdzy6a8s1m9dgqybn70h801h92fcr"; - }) - ]; - enableParallelBuilding = true; qtWrapperArgs = [ From 7d733bbc862383dac8e33bc505aeb58eff0db65e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 4 Oct 2019 22:57:55 -0500 Subject: [PATCH 2/4] 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 dbeff8a6c17..d6b319e1abe 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; From a6ab41fdfeb63d53d5c74960c6e4634547b1ed74 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 4 Oct 2019 23:04:16 -0500 Subject: [PATCH 3/4] qtpass: install man page --- pkgs/applications/misc/qtpass/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index d6b319e1abe..d2dd308b2c9 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -29,8 +29,9 @@ mkDerivation rec { ]; postInstall = '' - install -D qtpass.desktop $out/share/applications/qtpass.desktop + install -D qtpass.desktop -t $out/share/applications install -D artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg + install -D qtpass.1 -t $out/share/man/man1 ''; meta = with lib; { From 6362fecff6b5fd6faeb99be2fcea875219ab1779 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 4 Oct 2019 23:08:51 -0500 Subject: [PATCH 4/4] qtpass: add pwgen as optional runtime dep --- pkgs/applications/misc/qtpass/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index d2dd308b2c9..e6e0860f7ec 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,5 +1,6 @@ { lib, mkDerivation, fetchFromGitHub -, git, gnupg, pass, qtbase, qtsvg, qttools, qmake +, git, gnupg, pass, pwgen +, qtbase, qtsvg, qttools, qmake }: mkDerivation rec { @@ -25,7 +26,7 @@ mkDerivation rec { ]; qtWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}" + "--suffix PATH : ${lib.makeBinPath [ git gnupg pass pwgen ]}" ]; postInstall = ''