From 5f702e92207a43e189a180950f6dc6f8c4d22cfd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Jun 2023 16:33:46 +0300 Subject: [PATCH] mlt: build without qt5 --- pkgs/development/libraries/mlt/{qt-5.nix => default.nix} | 2 +- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/qt5-packages.nix | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) rename pkgs/development/libraries/mlt/{qt-5.nix => default.nix} (99%) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/default.nix similarity index 99% rename from pkgs/development/libraries/mlt/qt-5.nix rename to pkgs/development/libraries/mlt/default.nix index bb66003dda3d..71fb4214b833 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -28,7 +28,7 @@ , enablePython ? false , python3 , swig -, enableQt ? true +, enableQt ? false , libsForQt5 , enableSDL1 ? stdenv.isLinux , SDL diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c3be6463d55..e1f6443a4afd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23351,7 +23351,7 @@ with pkgs; mlc = callPackage ../tools/system/mlc { }; - mlt = libsForQt5.mlt; + mlt = darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt { }; mlib = callPackage ../development/libraries/mlib { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index fe5c65cb52fe..58c2e2001839 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -154,7 +154,9 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea maui-core = libsForQt5.callPackage ../development/libraries/maui-core { }; - mlt = pkgs.darwin.apple_sdk_11_0.callPackage ../development/libraries/mlt/qt-5.nix { }; + mlt = pkgs.mlt.override { + enableQt = true; + }; phonon = callPackage ../development/libraries/phonon { };