diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:46:33 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:46:33 +0200 |
commit | cff9e6429a4341e924594f5e057b03ca8101b314 (patch) | |
tree | f8c1a31c9ad11b4c417b9c331747f3b3dc47bdf4 /pkgs/applications/video | |
parent | a6055b7d8705d3c3a008e67cde1d43cf5727f76b (diff) | |
parent | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (diff) | |
download | nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.gz nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.bz2 nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.lz nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.xz nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.zst nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/shotcut/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index a683e192f11b..1b80e379008c 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase -, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols -, qtgraphicaleffects, libmlt -, qmake, makeWrapper, qttools }: +{ stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, mkDerivation +, pkgconfig, qtbase, qtmultimedia, qtwebkit, qtx11extras, qtwebsockets +, qtquickcontrols, qtgraphicaleffects, libmlt, qmake, qttools }: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; -stdenv.mkDerivation rec { +mkDerivation rec { name = "shotcut-${version}"; version = "19.07.15"; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ SDL2 frei0r gettext mlt libmlt qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols @@ -35,10 +34,15 @@ stdenv.mkDerivation rec { sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp ''; + qtWrapperArgs = [ + "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" + "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [jack1 SDL2 ]}" + "--prefix PATH : ${mlt}/bin" + ]; + postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ - wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]} --prefix PATH : ${mlt}/bin ''; meta = with stdenv.lib; { |