public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #67660 from lightbulbjim/qtpass-wayland

Browse Source 
qtpass: 1.2.3 -> 1.3.0
This commit is contained in:
worldofpeace 2019-08-29 00:56:08 -04:00 committed by GitHub
commit 2cb1eda297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/misc/qtpass/default.nix
View File

@ -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 { mkDerivation rec {
pname = "qtpass"; pname = "qtpass";
version = "1.2.3"; version = "1.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "IJHack"; owner = "IJHack";
repo = "QtPass"; repo = "QtPass";
rev = "v${version}"; rev = "v${version}";
sha256 = "1vfhfyccrxq9snyvayqfzm5rqik8ny2gysyv7nipc91kvhq3bhky"; sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv";
}; };
buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; 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; enableParallelBuilding = true;
qtWrapperArgs = [ qtWrapperArgs = [
"--suffix PATH : ${git}/bin" "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}"
"--suffix PATH : ${gnupg}/bin"
"--suffix PATH : ${pass}/bin"
]; ];
postInstall = '' postInstall = ''