diff options
author | Matthieu Coudron <mattator@gmail.com> | 2019-10-08 15:54:53 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-08 15:54:53 +0900 |
commit | c47fc5727af5078e0600f17434a4073ec4b0afab (patch) | |
tree | 54a015567ac9c479b41b48325be22197193bb8ed /pkgs/applications/misc | |
parent | 86e68d02b35ab2277f7acffd58ac1fee2af8d86c (diff) | |
parent | 6362fecff6b5fd6faeb99be2fcea875219ab1779 (diff) | |
download | nixpkgs-c47fc5727af5078e0600f17434a4073ec4b0afab.tar nixpkgs-c47fc5727af5078e0600f17434a4073ec4b0afab.tar.gz nixpkgs-c47fc5727af5078e0600f17434a4073ec4b0afab.tar.bz2 nixpkgs-c47fc5727af5078e0600f17434a4073ec4b0afab.tar.lz nixpkgs-c47fc5727af5078e0600f17434a4073ec4b0afab.tar.xz nixpkgs-c47fc5727af5078e0600f17434a4073ec4b0afab.tar.zst nixpkgs-c47fc5727af5078e0600f17434a4073ec4b0afab.zip |
Merge pull request #70686 from dtzWill/update/qtpass-1.3.1
qtpass: 1.3.0 -> 1.3.1, fixups
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/qtpass/default.nix | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 1fccada4200..e6e0860f7ec 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,43 +1,41 @@ -{ stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch -, git, gnupg, pass, qtbase, qtsvg, qttools, qmake +{ lib, mkDerivation, fetchFromGitHub +, git, gnupg, pass, pwgen +, qtbase, qtsvg, qttools, qmake }: mkDerivation rec { pname = "qtpass"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "IJHack"; repo = "QtPass"; rev = "v${version}"; - sha256 = "0v3ca4fdjk6l24vc9wlc0i7r6fdj85kjmnb7jvicd3f8xi9mvhnv"; + sha256 = "025sdk4fq71jgfs54zj7ssgvlci8vvjkqdckgbwz0nqrynlljy08"; }; - buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; + buildInputs = [ git gnupg pass qtbase qtsvg ]; - 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"; - }) - ]; + nativeBuildInputs = [ qmake qttools ]; enableParallelBuilding = true; + qmakeFlags = [ + # setup hook only sets QMAKE_LRELEASE, set QMAKE_LUPDATE too: + "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" + ]; + qtWrapperArgs = [ - "--suffix PATH : ${lib.makeBinPath [ git gnupg pass ]}" + "--suffix PATH : ${lib.makeBinPath [ git gnupg pass pwgen ]}" ]; 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 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"; homepage = https://qtpass.org; license = licenses.gpl3; |