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

qtpass: use wrapQtProgramm instead of standard wrapper

Browse Source
This commit is contained in:
Christoph Hrdinka 2016-01-31 21:35:15 +01:00
parent 2924099dae
commit 12ecc1ceb3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, git, gnupg, makeWrapper, pass, qtbase, qttools }: { stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qtpass-${version}"; name = "qtpass-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6"; 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"; configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out";
@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
mv $out/qtpass $out/bin mv $out/qtpass $out/bin
''; '';
postInstall = '' postFixup = ''
wrapProgram $out/bin/qtpass \ wrapQtProgram $out/bin/qtpass \
--suffix PATH : ${git}/bin \ --suffix PATH : ${git}/bin \
--suffix PATH : ${gnupg}/bin \ --suffix PATH : ${gnupg}/bin \
--suffix PATH : ${pass}/bin --suffix PATH : ${pass}/bin