git.iko.soy/typeable/nixpkgs
on master help sign in
shotcut: use qt-5.15, rework

- use qt-5.15 for shotcut - use qt mkDerivation for mlt/qt5 - use only mlt/qt5 for shotcut (libmlt -> mlt.dev) - fix enabling ladspa (configure needs `which`), closes #47440

commit05440fda6f0d922b9084b1f2a64cbc256e7e5ffb authorFrank Doepper <github@woffs.de> dateThu 26 Nov 2020, 12:29 (6 years ago) parent4d15dd3
3 files changed+57−18
compare with master
unifiedsplit
pkgs/applications/video/shotcut/default.nix+4−4 pkgs/development/libraries/mlt/qt-5.nix+52−11 pkgs/top-level/all-packages.nix+1−3
pkgs/applications/video/shotcut/default.nix+4−4
@@ -4,6 +4,7 @@
44, mkDerivation
55, SDL2
66, frei0r
7+, ladspaPlugins
78, gettext
89, mlt
910, jack1
@@ -14,14 +15,12 @@
1415, qtwebsockets
1516, qtquickcontrols2
1617, qtgraphicaleffects
17−, libmlt
1818, qmake
1919, qttools
2020, genericUpdater
2121, common-updater-scripts
2222}:
2323
24−assert stdenv.lib.versionAtLeast libmlt.version "6.22.1";
2524assert stdenv.lib.versionAtLeast mlt.version "6.22.1";
2625
2726mkDerivation rec {
@@ -40,9 +39,9 @@ mkDerivation rec {
4039 buildInputs = [
4140 SDL2
4241 frei0r
42+ ladspaPlugins
4343 gettext
4444 mlt
45− libmlt
4645 qtbase
4746 qtmultimedia
4847 qtx11extras
@@ -51,7 +50,7 @@ mkDerivation rec {
5150 qtgraphicaleffects
5251 ];
5352
54− NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt";
53+ NIX_CFLAGS_COMPILE = "-I${mlt.dev}/include/mlt++ -I${mlt.dev}/include/mlt";
5554 qmakeFlags = [
5655 "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease"
5756 "SHOTCUT_VERSION=${version}"
@@ -68,6 +67,7 @@ mkDerivation rec {
6867
6968 qtWrapperArgs = [
7069 "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
70+ "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
7171 "--prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL2 ]}"
7272 "--prefix PATH : ${mlt}/bin"
7373 ];
pkgs/development/libraries/mlt/qt-5.nix+52−11
@@ -1,11 +1,30 @@
1−{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
2−, libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg
3−, fftw, vid-stab, opencv3, ladspa-sdk, genericUpdater, common-updater-scripts
1+{ stdenv
2+, fetchFromGitHub
3+, SDL
4+, ffmpeg
5+, frei0r
6+, libjack2
7+, libdv
8+, libsamplerate
9+, libvorbis
10+, libxml2
11+, movit
12+, pkgconfig
13+, sox
14+, qtbase
15+, qtsvg
16+, fftw
17+, vid-stab
18+, opencv3
19+, ladspa-sdk
20+, genericUpdater
21+, common-updater-scripts
22+, ladspaPlugins
23+, mkDerivation
24+, which
425}:
5−
626let inherit (stdenv.lib) getDev; in
7−
8−stdenv.mkDerivation rec {
27+mkDerivation rec {
928 pname = "mlt";
1029 version = "6.22.1";
1130
@@ -17,17 +36,36 @@ stdenv.mkDerivation rec {
1736 };
1837
1938 buildInputs = [
20− SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
21− makeWrapper movit pkgconfig qtbase qtsvg sox fftw vid-stab opencv3
39+ SDL
40+ ffmpeg
41+ frei0r
42+ libjack2
43+ libdv
44+ libsamplerate
45+ libvorbis
46+ libxml2
47+ movit
48+ pkgconfig
49+ qtbase
50+ qtsvg
51+ sox
52+ fftw
53+ vid-stab
54+ opencv3
2255 ladspa-sdk
56+ ladspaPlugins
2357 ];
2458
59+ nativeBuildInputs = [ which ];
60+
2561 outputs = [ "out" "dev" ];
2662
2763 # Mostly taken from:
2864 # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
2965 configureFlags = [
30− "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3"
66+ "--avformat-swscale"
67+ "--enable-gpl"
68+ "--enable-gpl3"
3169 "--enable-opengl"
3270 ];
3371
@@ -39,9 +77,12 @@ stdenv.mkDerivation rec {
3977
4078 enableParallelBuilding = true;
4179
42− postInstall = ''
43− wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
80+ qtWrapperArgs = [
81+ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
82+ "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
83+ ];
4484
85+ postInstall = ''
4586 # Remove an unnecessary reference to movit.dev.
4687 s=${movit.dev}/include
4788 t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done)
pkgs/top-level/all-packages.nix+1−3
@@ -22773,9 +22773,7 @@ in
2277322773
2277422774 scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
2277522775
22776− shotcut = libsForQt514.callPackage ../applications/video/shotcut {
22777− libmlt = mlt;
22778− };
22776+ shotcut = libsForQt5.callPackage ../applications/video/shotcut { };
2277922777
2278022778 shogun = callPackage ../applications/science/machine-learning/shogun {
2278122779 stdenv = gcc8Stdenv;