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

Merge pull request #70686 from dtzWill/update/qtpass-1.3.1

Browse Source 
qtpass: 1.3.0 -> 1.3.1, fixups
This commit is contained in:
Matthieu Coudron 2019-10-08 15:54:53 +09:00 committed by GitHub
commit c47fc5727a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,43 +1,41 @@
{ stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch { lib, mkDerivation, fetchFromGitHub
, git, gnupg, pass, qtbase, qtsvg, qttools, qmake , git, gnupg, pass, pwgen
, qtbase, qtsvg, qttools, qmake
}: }:
mkDerivation rec { mkDerivation rec {
pname = "qtpass"; pname = "qtpass";
version = "1.3.0"; version = "1.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "IJHack"; owner = "IJHack";
repo = "QtPass"; repo = "QtPass";
rev = "v${version}"; rev = "v${version}";
sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv"; sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08";
}; };
buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; buildInputs = [ git gnupg pass qtbase qtsvg ];
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake qttools ];
# 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;
qmakeFlags = [
# setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too:
"QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
];
qtWrapperArgs = [ qtWrapperArgs = [
"--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}" "--suffix PATH : ${lib.makeBinPath [ git gnupg pass pwgen ]}"
]; ];
postInstall = '' 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 artwork/icon.svg $out/share/icons/hicolor/scalable/apps/qtpass-icon.svg
install -D qtpass.1 -t $out/share/man/man1
''; '';
meta = with stdenv.lib; { meta = with lib; {
description = "A multi-platform GUI for pass, the standard unix password manager"; description = "A multi-platform GUI for pass, the standard unix password manager";
homepage = https://qtpass.org; homepage = https://qtpass.org;
license = licenses.gpl3; license = licenses.gpl3;