From 392763aea636fa9a59889b2d0162d959b11de0da Mon Sep 17 00:00:00 2001 From: Chris Rendle-Short Date: Wed, 28 Aug 2019 10:08:28 +1000 Subject: [PATCH 1/2] qtpass: fix missing app icon and name when running under Wayland Patch has been upstreamed and should be safe to remove in versions > 1.3.0 --- pkgs/applications/misc/qtpass/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 462114ed272..cbe24f7183a 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,4 +1,6 @@ -{ stdenv, mkDerivation, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }: +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch +, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper +}: mkDerivation rec { pname = "qtpass"; @@ -15,6 +17,15 @@ mkDerivation rec { nativeBuildInputs = [ makeWrapper 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 8de860b60d0deb6aa0a13f0e16723bbce70f1a67 Mon Sep 17 00:00:00 2001 From: Chris Rendle-Short Date: Thu, 29 Aug 2019 08:25:52 +1000 Subject: [PATCH 2/2] qtpass: 1.2.3 -> 1.3.0 --- pkgs/applications/misc/qtpass/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index cbe24f7183a..1fccada4200 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 = ''