diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-16 22:06:22 +0100 |
| commit | a7a8f8253db3f32cc15baf527d36ef7171425eba (patch) | |
| tree | 5de25f1c82e7892f6aec7b3e5ddb718ff0c50df2 /pkgs/development/libraries/qt-6/default.nix | |
| parent | f31242fcfd14e870eb6898fc8849bc4dee883054 (diff) | |
| parent | 391aafc3d6b17ed5517795eb8b9c41ed7c6082e3 (diff) | |
Merge #263535: staging-next 2023-10-26
Diffstat (limited to 'pkgs/development/libraries/qt-6/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-6/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 4a211e5cb915f..bef3f7ef62e86 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -9,6 +9,7 @@ , gst_all_1 , libglvnd , darwin +, overrideSDK , buildPackages , python3 @@ -141,13 +142,18 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) bootstrap_cmds cctools xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind llvmPackages_14; + inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; + qtModule = qtModule.override { + stdenv = if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + else stdenv; + }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; |