diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 60ec139d0c04..bb66003dda3d 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -5,8 +5,6 @@ , cmake , pkg-config , which -, wrapQtAppsHook -, SDL2 , ffmpeg , fftw , frei0r @@ -17,8 +15,6 @@ , libxml2 , movit , opencv4 -, qtbase -, qtsvg , rtaudio , rubberband , sox @@ -26,12 +22,18 @@ , darwin , cudaSupport ? config.cudaSupport or false , cudaPackages ? { } -, jackrackSupport ? stdenv.isLinux +, enableJackrack ? stdenv.isLinux , ladspa-sdk , ladspaPlugins -, pythonSupport ? false +, enablePython ? false , python3 , swig +, enableQt ? true +, libsForQt5 +, enableSDL1 ? stdenv.isLinux +, SDL +, enableSDL2 ? true +, SDL2 , gitUpdater }: @@ -50,16 +52,16 @@ stdenv.mkDerivation rec { cmake pkg-config which - wrapQtAppsHook ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc - ] ++ lib.optionals pythonSupport [ + ] ++ lib.optionals enablePython [ python3 swig + ] ++ lib.optionals enableQt [ + libsForQt5.wrapQtAppsHook ]; buildInputs = [ - SDL2 ffmpeg fftw frei0r @@ -70,8 +72,6 @@ stdenv.mkDerivation rec { libxml2 movit opencv4 - qtbase - qtsvg rtaudio rubberband sox @@ -80,9 +80,16 @@ stdenv.mkDerivation rec { darwin.apple_sdk_11_0.frameworks.Accelerate ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart - ] ++ lib.optionals jackrackSupport [ + ] ++ lib.optionals enableJackrack [ ladspa-sdk ladspaPlugins + ] ++ lib.optionals enableQt [ + libsForQt5.qtbase + libsForQt5.qtsvg + ] ++ lib.optionals enableSDL1 [ + SDL + ] ++ lib.optionals enableSDL2 [ + SDL2 ]; outputs = [ "out" "dev" ]; @@ -91,13 +98,13 @@ stdenv.mkDerivation rec { # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ "-DCMAKE_SKIP_BUILD_RPATH=ON" "-DMOD_OPENCV=ON" - ] ++ lib.optionals pythonSupport [ + ] ++ lib.optionals enablePython [ "-DSWIG_PYTHON=ON" ]; qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" - ] ++ lib.optionals jackrackSupport [ + ] ++ lib.optionals enableJackrack [ "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" ]; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 48a8d6f39778..fe5c65cb52fe 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -154,9 +154,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; - mlt = callPackage ../development/libraries/mlt/qt-5.nix { - stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; - }; + mlt = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt/qt-5.nix { }; phonon = callPackage ../development/libraries/phonon { };