about summary refs log tree commit diff
path: root/pkgs/applications/misc/qtpass/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/misc/qtpass/default.nix')
-rw-r--r--pkgs/applications/misc/qtpass/default.nix23
1 files changed, 16 insertions, 7 deletions
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 462114ed2721c..1fccada420037 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,26 +1,35 @@
-{ stdenv, mkDerivation, fetchFromGitHub, 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
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/IJHack/QtPass/commit/aba8c4180f0ab3d66c44f88b21f137b19d17bde8.patch";
+      sha256 = "009bcq0d75khmaligzd7736xdzy6a8s1m9dgqybn70h801h92fcr";
+    })
+  ];
 
   enableParallelBuilding = true;
 
   qtWrapperArgs = [
-    "--suffix PATH : ${git}/bin"
-    "--suffix PATH : ${gnupg}/bin"
-    "--suffix PATH : ${pass}/bin"
+    "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}"
   ];
 
   postInstall = ''