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
+3 -3
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
qtgraphicaleffects,
qmake, makeQtWrapper }:
qmake, makeWrapper }:
stdenv.mkDerivation rec {
name = "shotcut-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
buildInputs = [
SDL frei0r gettext mlt
qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/shotcut
cp -r src/qml $out/share/shotcut/
wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
'';
meta = with stdenv.lib; {