qt5: remove makeQtWrapper

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
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
, qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
, openssl, protobuf, qmake
}:
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
openssl protobuf
];
nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
nativeBuildInputs = [ pkgconfig qmake ];
preConfigure = ''
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp ricochet $out/bin
wrapQtProgram $out/bin/ricochet
mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications