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

qt5: remove makeQtWrapper

Browse Source
This commit is contained in:
Thomas Tuegel
2017-06-18 08:44:42 -05:00
parent 1607f51613
commit c816bbc8a8
92 changed files with 323 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/misc/qtpass/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmake }:
{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
stdenv.mkDerivation rec {
name = "qtpass-${version}";
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
nativeBuildInputs = [ makeQtWrapper qmake ];
nativeBuildInputs = [ makeWrapper qmake ];
preConfigure = ''
qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
qmakeFlags="$qmakeFlags DESTDIR=$out"
'';
installPhase = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
wrapQtProgram $out/bin/qtpass \
wrapProgram $out/bin/qtpass \
--suffix PATH : ${git}/bin \
--suffix PATH : ${gnupg}/bin \
--suffix PATH : ${pass}/bin