tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
qt5: switch to Apple SDK 14 on -darwin platforms
Fixes weird linking errors seen with SDK 13.
+5
-7
+3
-5
pkgs/development/libraries/qt-5/modules/qtbase.nix
+3
-5
pkgs/development/libraries/qt-5/modules/qtbase.nix
···
17
17
python3,
18
18
which,
19
19
# darwin support
20
-
apple-sdk_13,
20
+
apple-sdk_14,
21
21
xcbuild,
22
22
23
23
dbus,
···
88
88
throw "Please add a qtPlatformCross entry for ${plat.config}";
89
89
90
90
# Per https://doc.qt.io/qt-5/macos.html#supported-versions: build SDK = 13.x or 14.x.
91
-
# Despite advertising support for the macOS 14 SDK, the build system sets the maximum to 13 and complains
92
-
# about 14, so we just use that.
93
-
deploymentTarget = "10.13";
91
+
# SDK 13.x causes weird linking errors on x86_64-darwin, so use 14.x
94
92
darwinVersionInputs = [
95
-
apple-sdk_13
93
+
apple-sdk_14
96
94
];
97
95
in
98
96
+2
-2
pkgs/development/libraries/qt-5/qtModule.nix
+2
-2
pkgs/development/libraries/qt-5/qtModule.nix
···
3
3
stdenv,
4
4
buildPackages,
5
5
mkDerivation,
6
-
apple-sdk_13,
6
+
apple-sdk_14,
7
7
perl,
8
8
qmake,
9
9
patches,
···
33
33
args.buildInputs or [ ]
34
34
# Per https://doc.qt.io/qt-5/macos.html#supported-versions
35
35
++ lib.optionals stdenv.hostPlatform.isDarwin [
36
-
apple-sdk_13
36
+
apple-sdk_14
37
37
];
38
38
39
39
nativeBuildInputs =