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, fetchurl, cmake, qmake, makeQtWrapper, qtbase, perl, python, php }:
{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php }:
stdenv.mkDerivation rec {
name = "qcachegrind-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase perl python php ];
nativeBuildInputs = [ qmake makeQtWrapper ];
nativeBuildInputs = [ qmake ];
postInstall = ''
mkdir -p $out/bin
@@ -25,10 +25,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/Applications
cp cgview/cgview.app/Contents/MacOS/cgview $out/bin
cp -a qcachegrind/qcachegrind.app $out/Applications
wrapQtProgram $out/Applications/qcachegrind.app/Contents/MacOS/qcachegrind
'' else ''
install qcachegrind/qcachegrind cgview/cgview -t "$out/bin"
wrapQtProgram "$out/bin/qcachegrind"
install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications"
install -Dm644 kcachegrind/hi32-app-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png"
install -Dm644 kcachegrind/hi48-app-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"