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,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, makeQtWrapper, mesa }:
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }:
stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ qtbase vcg glew ];
enableParallelBuilding = true;
nativeBuildInputs = [ qmake makeQtWrapper ];
nativeBuildInputs = [ qmake ];
qmakeFlags = [ "openBrf.pro" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
--set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \
$out/share/openBrf/openBrf
makeQtWrapper "$out/share/openBrf/openBrf" "$out/bin/openBrf"
ln -s "$out/share/openBrf/openBrf" "$out/bin/openBrf"
'';
dontPatchELF = true;