Merge pull request #240125 from wegank/mlt-qt

mlt: build without qt5

authored by Weijia Wang and committed by GitHub 757c2b56 534528c1

+5 -3
+1 -1
pkgs/development/libraries/mlt/qt-5.nix pkgs/development/libraries/mlt/default.nix
··· 28 , enablePython ? false 29 , python3 30 , swig 31 - , enableQt ? true 32 , libsForQt5 33 , enableSDL1 ? stdenv.isLinux 34 , SDL
··· 28 , enablePython ? false 29 , python3 30 , swig 31 + , enableQt ? false 32 , libsForQt5 33 , enableSDL1 ? stdenv.isLinux 34 , SDL
+1 -1
pkgs/top-level/all-packages.nix
··· 23355 23356 mlc = callPackage ../tools/system/mlc { }; 23357 23358 - mlt = libsForQt5.mlt; 23359 23360 mlib = callPackage ../development/libraries/mlib { }; 23361
··· 23355 23356 mlc = callPackage ../tools/system/mlc { }; 23357 23358 + mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { }; 23359 23360 mlib = callPackage ../development/libraries/mlib { }; 23361
+3 -1
pkgs/top-level/qt5-packages.nix
··· 154 155 maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; 156 157 - mlt = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt/qt-5.nix { }; 158 159 phonon = callPackage ../development/libraries/phonon { }; 160
··· 154 155 maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; 156 157 + mlt = pkgs.mlt.override { 158 + enableQt = true; 159 + }; 160 161 phonon = callPackage ../development/libraries/phonon { }; 162