diff options
author | Christoph Hrdinka <c.github@hrdinka.at> | 2016-01-31 21:35:15 +0100 |
---|---|---|
committer | Christoph Hrdinka <c.github@hrdinka.at> | 2016-01-31 21:35:15 +0100 |
commit | 12ecc1ceb3202c64d706a2cde950ced592fa552b (patch) | |
tree | ed064fc2dd7237e9e96dcbc00c023e41f28e6c3a /pkgs/applications/misc | |
parent | 2924099daef38ddb569a5cea26628c22f739c51e (diff) |
qtpass: use wrapQtProgramm instead of standard wrapper
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/qtpass/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index c3080975f0b29..08e7f834d6bb1 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; { |