diff options
author | Chris Rendle-Short <chris@killred.net> | 2019-08-29 08:25:52 +1000 |
---|---|---|
committer | Chris Rendle-Short <chris@killred.net> | 2019-08-29 14:52:47 +1000 |
commit | 8de860b60d0deb6aa0a13f0e16723bbce70f1a67 (patch) | |
tree | 870eb2272f9d12e00727425aeee25242358e16d0 /pkgs/applications/misc/qtpass | |
parent | 392763aea636fa9a59889b2d0162d959b11de0da (diff) |
qtpass: 1.2.3 -> 1.3.0
Diffstat (limited to 'pkgs/applications/misc/qtpass')
-rw-r--r-- | pkgs/applications/misc/qtpass/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index cbe24f7183a57..1fccada420037 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,21 +1,21 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch -, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper +{ stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch +, git, gnupg, pass, qtbase, qtsvg, qttools, qmake }: mkDerivation rec { pname = "qtpass"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky"; + sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv"; }; buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; - nativeBuildInputs = [ makeWrapper qmake ]; + nativeBuildInputs = [ qmake ]; # Fix missing app icon on Wayland. Has been upstreamed and should be safe to # remove in versions > 1.3.0 @@ -29,9 +29,7 @@ mkDerivation rec { enableParallelBuilding = true; qtWrapperArgs = [ - "--suffix PATH : ${git}/bin" - "--suffix PATH : ${gnupg}/bin" - "--suffix PATH : ${pass}/bin" + "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}" ]; postInstall = '' |