From 2924099daef38ddb569a5cea26628c22f739c51e Mon Sep 17 00:00:00 2001 From: Anne Jan Brouwer Date: Tue, 26 Jan 2016 12:36:00 +0100 Subject: [PATCH 1/2] qtpass: 1.0.6 -> 1.1.0 --- pkgs/applications/misc/qtpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 940aa8eb4bf..c3080975f0b 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz"; - sha256 = "ccad9a06e3efa23278fa3e958185bf24fb3800874d8165be4ae6649706a2ab1c"; + sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6"; }; buildInputs = [ git gnupg makeWrapper pass qtbase qttools ]; From 12ecc1ceb3202c64d706a2cde950ced592fa552b Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Sun, 31 Jan 2016 21:35:15 +0100 Subject: [PATCH 2/2] qtpass: use wrapQtProgramm instead of standard wrapper --- pkgs/applications/misc/qtpass/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index c3080975f0b..08e7f834d6b 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, git, gnupg, makeWrapper, pass, qtbase, qttools }: +{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools }: stdenv.mkDerivation rec { name = "qtpass-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6"; }; - buildInputs = [ git gnupg makeWrapper pass qtbase qttools ]; + buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools ]; configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out"; @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { mv $out/qtpass $out/bin ''; - postInstall = '' - wrapProgram $out/bin/qtpass \ - --suffix PATH : ${git}/bin \ - --suffix PATH : ${gnupg}/bin \ - --suffix PATH : ${pass}/bin + postFixup = '' + wrapQtProgram $out/bin/qtpass \ + --suffix PATH : ${git}/bin \ + --suffix PATH : ${gnupg}/bin \ + --suffix PATH : ${pass}/bin ''; meta = with stdenv.lib; {