mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-27 06:25:23 +00:00
qt6.qtbase: build with the 14.4 SDK
Per upstream’s supported Darwin versions, built with the 14.4 SDK (corresponding to Xcode 15) and a 11.0 deployment target. To ensure that users of Qt have a compatible SDK and deployment target, propagate the 11.3 SDK and a 11.0 minimum version. Users that need a newer version can opt into using it by adding the SDK package to their build inputs.
This commit is contained in:
parent
61d0e51c9c
commit
830b9fe572
@ -67,15 +67,10 @@
|
|||||||
, unixODBCDrivers
|
, unixODBCDrivers
|
||||||
# darwin
|
# darwin
|
||||||
, moveBuildTree
|
, moveBuildTree
|
||||||
|
, apple-sdk_11
|
||||||
|
, apple-sdk_14
|
||||||
|
, darwinMinVersionHook
|
||||||
, xcbuild
|
, xcbuild
|
||||||
, AGL
|
|
||||||
, AVFoundation
|
|
||||||
, AppKit
|
|
||||||
, Contacts
|
|
||||||
, CoreBluetooth
|
|
||||||
, EventKit
|
|
||||||
, GSS
|
|
||||||
, MetalKit
|
|
||||||
# mingw
|
# mingw
|
||||||
, pkgsBuildBuild
|
, pkgsBuildBuild
|
||||||
# optional dependencies
|
# optional dependencies
|
||||||
@ -162,14 +157,8 @@ stdenv.mkDerivation rec {
|
|||||||
xorg.xcbutilcursor
|
xorg.xcbutilcursor
|
||||||
libepoxy
|
libepoxy
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
AGL
|
apple-sdk_14
|
||||||
AVFoundation
|
(darwinMinVersionHook "11.0")
|
||||||
AppKit
|
|
||||||
Contacts
|
|
||||||
CoreBluetooth
|
|
||||||
EventKit
|
|
||||||
GSS
|
|
||||||
MetalKit
|
|
||||||
] ++ lib.optionals libGLSupported [
|
] ++ lib.optionals libGLSupported [
|
||||||
libGL
|
libGL
|
||||||
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
|
] ++ lib.optionals stdenv.hostPlatform.isMinGW [
|
||||||
@ -181,9 +170,9 @@ stdenv.mkDerivation rec {
|
|||||||
at-spi2-core
|
at-spi2-core
|
||||||
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [
|
] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [
|
||||||
libinput
|
libinput
|
||||||
] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||||
AppKit
|
apple-sdk_11
|
||||||
CoreBluetooth
|
(darwinMinVersionHook "11.0")
|
||||||
]
|
]
|
||||||
++ lib.optional withGtk3 gtk3
|
++ lib.optional withGtk3 gtk3
|
||||||
++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient
|
++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient
|
||||||
|
Loading…
Reference in New Issue
Block a user