b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libsForQt5.mlt: add more modules

Browse source
This commit is contained in:
Weijia Wang 2023-06-27 14:27:34 +03:00
parent 45a70744c7
commit 2a8350d78a
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
pkgs/development/libraries/mlt/qt-5.nix
View file

@ -5,8 +5,6 @@
, cmake , cmake
, pkg-config , pkg-config
, which , which
, wrapQtAppsHook
, SDL2
, ffmpeg , ffmpeg
, fftw , fftw
, frei0r , frei0r
@ -17,8 +15,6 @@
, libxml2 , libxml2
, movit , movit
, opencv4 , opencv4
, qtbase
, qtsvg
, rtaudio , rtaudio
, rubberband , rubberband
, sox , sox
@ -26,12 +22,18 @@
, darwin , darwin
, cudaSupport ? config.cudaSupport or false , cudaSupport ? config.cudaSupport or false
, cudaPackages ? { } , cudaPackages ? { }
, jackrackSupport ? stdenv.isLinux , enableJackrack ? stdenv.isLinux
, ladspa-sdk , ladspa-sdk
, ladspaPlugins , ladspaPlugins
, pythonSupport ? false , enablePython ? false
, python3 , python3
, swig , swig
, enableQt ? true
, libsForQt5
, enableSDL1 ? stdenv.isLinux
, SDL
, enableSDL2 ? true
, SDL2
, gitUpdater , gitUpdater
}: }:
@ -50,16 +52,16 @@ stdenv.mkDerivation rec {
cmake cmake
pkg-config pkg-config
which which
wrapQtAppsHook
] ++ lib.optionals cudaSupport [ ] ++ lib.optionals cudaSupport [
cudaPackages.cuda_nvcc cudaPackages.cuda_nvcc
] ++ lib.optionals pythonSupport [ ] ++ lib.optionals enablePython [
python3 python3
swig swig
] ++ lib.optionals enableQt [
libsForQt5.wrapQtAppsHook
]; ];
buildInputs = [ buildInputs = [
SDL2
ffmpeg ffmpeg
fftw fftw
frei0r frei0r
@ -70,8 +72,6 @@ stdenv.mkDerivation rec {
libxml2 libxml2
movit movit
opencv4 opencv4
qtbase
qtsvg
rtaudio rtaudio
rubberband rubberband
sox sox
@ -80,9 +80,16 @@ stdenv.mkDerivation rec {
darwin.apple_sdk_11_0.frameworks.Accelerate darwin.apple_sdk_11_0.frameworks.Accelerate
] ++ lib.optionals cudaSupport [ ] ++ lib.optionals cudaSupport [
cudaPackages.cuda_cudart cudaPackages.cuda_cudart
] ++ lib.optionals jackrackSupport [ ] ++ lib.optionals enableJackrack [
ladspa-sdk ladspa-sdk
ladspaPlugins ladspaPlugins
] ++ lib.optionals enableQt [
libsForQt5.qtbase
libsForQt5.qtsvg
] ++ lib.optionals enableSDL1 [
SDL
] ++ lib.optionals enableSDL2 [
SDL2
]; ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -91,13 +98,13 @@ stdenv.mkDerivation rec {
# RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
"-DCMAKE_SKIP_BUILD_RPATH=ON" "-DCMAKE_SKIP_BUILD_RPATH=ON"
"-DMOD_OPENCV=ON" "-DMOD_OPENCV=ON"
] ++ lib.optionals pythonSupport [ ] ++ lib.optionals enablePython [
"-DSWIG_PYTHON=ON" "-DSWIG_PYTHON=ON"
]; ];
qtWrapperArgs = [ qtWrapperArgs = [
"--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1"
] ++ lib.optionals jackrackSupport [ ] ++ lib.optionals enableJackrack [
"--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa"
]; ];

4
pkgs/top-level/qt5-packages.nix
View file

@ -154,9 +154,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; maui-core = libsForQt5.callPackage ../development/libraries/maui-core { };
mlt = callPackage ../development/libraries/mlt/qt-5.nix { mlt = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt/qt-5.nix { };
stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv;
};
phonon = callPackage ../development/libraries/phonon { }; phonon = callPackage ../development/libraries/phonon { };