qt5: remove makeQtWrapper

This commit is contained in:
Thomas Tuegel
2017-05-17 14:26:11 -05:00
parent 1607f51613
commit c816bbc8a8
92 changed files with 323 additions and 582 deletions

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper
, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmake
, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake
, withDocumentation ? false
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
nativeBuildInputs = [ qmake makeQtWrapper makeWrapper ];
nativeBuildInputs = [ qmake makeWrapper ];
doCheck = true;
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
postInstall = ''
substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
--replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
wrapQtProgram $out/bin/qtcreator
'';
meta = {