qtpass: 1.2.3 -> 1.3.0

This commit is contained in:
Chris Rendle-Short 2019-08-29 08:25:52 +10:00
parent 392763aea6
commit 8de860b60d

View File

@ -1,21 +1,21 @@
{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch { stdenv, lib, mkDerivation, fetchFromGitHub, fetchpatch
, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper , 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 # Fix missing app icon on Wayland. Has been upstreamed and should be safe to
# remove in versions > 1.3.0 # remove in versions > 1.3.0
@ -29,9 +29,7 @@ mkDerivation rec {
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 = ''