diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-09 10:31:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-09 10:31:01 -0400 |
commit | 248791870f1bac024b8ae775ddb62e43beecbaf7 (patch) | |
tree | afa5d17c889250077184d7a994f869eedb2ab94b /pkgs/applications/video | |
parent | e31eca3a4cc60f2120aaf4dc50ba74d36f744f06 (diff) | |
parent | cc1f808891c8904388443b030c143092b206dfc5 (diff) |
Merge pull request #65785 from rawkode/feature/qtwrap-shotcut
shotcut: use qt5's mkDerivation
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 a683e192f11b2..1b80e379008c1 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; { |