qt{5,6}: update for the new Darwin SDK #347216
Conversation
|
@K900 pinging you since you’d been interested in this on Matrix. |
reckenrode
force-pushed
the
push-nyvqzpppwmom
branch
from
844e00a to
9eaf9d5
Compare
|
For future cleaner‐uppers, to avoid making Randy build Qt again: |
There was a problem hiding this comment.
Reiterating what I said on Matrix: these kinds of diffs are incredibly satisfying and I can’t think of anything better to point people at to explain how much of an improvement the new model is. A couple comments that are more me thinking out loud than anything.
| # FIXME These dependencies shouldn't be needed but can't find a way | ||
| # around it. Chromium pulls this in while bootstrapping GN. | ||
| ++ lib.optionals stdenv.hostPlatform.isDarwin [ | ||
| libobjc | ||
| cctools | ||
|
|
||
| # frameworks | ||
| ApplicationServices | ||
| AVFoundation | ||
| Foundation | ||
| ForceFeedback | ||
| GameController | ||
| AppKit | ||
| ImageCaptureCore | ||
| CoreBluetooth | ||
| IOBluetooth | ||
| CoreWLAN | ||
| Quartz | ||
| Cocoa | ||
| LocalAuthentication | ||
| MediaPlayer | ||
| MediaAccessibility | ||
| SecurityInterface | ||
| Vision | ||
| CoreML | ||
| OpenDirectory | ||
| Accelerate | ||
|
|
||
| openbsm | ||
| libunwind | ||
| ]; | ||
| ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ]; |
There was a problem hiding this comment.
This comment seems probably inaccurate now? Though I don’t really know what it meant to begin with.
There was a problem hiding this comment.
I’m seeing if I can drop it now that xcbuild includes xcrun. I also tried dropping the patches as suggested above.
There was a problem hiding this comment.
Ah, I meant this comment that I don’t really understand:
# FIXME These dependencies shouldn't be needed but can't find a way
# around it. Chromium pulls this in while bootstrapping GN.There was a problem hiding this comment.
I’m seeing if I can go one step further and delete the whole thing. If not, I’ll drop or change the comment.
There was a problem hiding this comment.
Nope. Deleting those would be non-trivial. It requires replacing the qtbase mkspecs patches with different patches to use xcbuild. If someone wants to do that later, that’s fine; but it’s beyond the scope of what I want to do with this PR (which is clean things up and use the new SDK).
| openbsm | ||
| libunwind | ||
| ]; | ||
| ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ]; | ||
|
|
||
| buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ | ||
| cups |
There was a problem hiding this comment.
(I wonder if it just needs the headers?)
There was a problem hiding this comment.
For CUPS? CUPS headers are propagated by the SDK now. I wonder if Chromium is detecting CUPS support due to that.
|
|
reckenrode
force-pushed
the
reckenrode/darwin-sdk-refactor
branch
2 times, most recently
from
a240201 to
4112f1a
Compare
Per upstream’s supported Darwin versions, built with the 14.4 SDK (corresponding to Xcode 15) and a 10.14 deployment target. To ensure that users of Qt have a compatible SDK and deployment target, propagate the 10.14 SDK and a 10.14 minimum version. Users that need a newer version can opt into using it by adding the SDK package to their build inputs. aarch64-darwin uses 11.0 and 11.3 because those are the oldest supported SDK and deployment target on that platform. Note: upstream actually supports 10.13, but 10.14 was chosen as the minimum and SDK because it ensures that automatic dark mode switching works for x86_64-darwin users.
This change ensures all Qt modules build with the latest SDK.
Qt is using the new Darwin SDK, which no longer requires overrideSDK to change the SDK version or set the deployment target.
While the 14.4 SDK works to build the rest of Qt 5, building Qt
WebEngine fails with errors like the following:
In file included from gen/base/base_jumbo_37.cc:14:
In file included from ./../../3rdparty/chromium/base/mac/mach_port_rendezvous.cc:16:
In file included from ../../3rdparty/chromium/base/mac/foundation_util.h:34:
In file included from /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/ApplicationServices.framework/Headers/ApplicationServices.h:39:
In file included from /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreText.framework/Headers/CoreText.h:26:
In file included from /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreText.framework/Headers/CTFramesetter.h:21:
In file included from /nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreText.framework/Headers/CTTypesetter.h:20:
/nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreText.framework/Headers/CTLine.h:138:5: error: unknown type name 'CFAttributedStringRef'; did you mean 'CFMutableStringRef'?
CFAttributedStringRef attrString ) CT_AVAILABLE(macos(10.5), ios(3.2), watchos(2.0), tvos(9.0));
^
/nix/store/sfdyfscmykycv7nfscn551lyl3gf4n27-apple-sdk-14.4/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreFoundation.framework/Headers/CFBase.h:500:70: note: 'CFMutableStringRef' declared here
typedef struct CF_BRIDGED_MUTABLE_TYPE(NSMutableString) __CFString * CFMutableStringRef;
^
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 change ensures all Qt modules build with the latest SDK.
Qt Multimediate is being built with a newer SDK that has the new definition, so don’t bother to patch it out anymore. The symbol is defined in a backwards compatible way, so it will still work on older releases that don’t have it in their SDKs.
Qt is using the new Darwin SDK, which no longer requires overrideSDK to change the SDK version or set the deployment target.
reckenrode
force-pushed
the
push-nyvqzpppwmom
branch
from
9eaf9d5 to
0725c33
Compare
reckenrode
force-pushed
the
reckenrode/darwin-sdk-refactor
branch
2 times, most recently
from
a1adff0 to
e3f2829
Compare
reckenrode
changed the base branch from
reckenrode/darwin-sdk-refactor
to
staging
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
| --replace "/System/Library/Frameworks/OpenGL.framework/" "${OpenGL}/Library/Frameworks/OpenGL.framework/" \ | ||
| --replace "/System/Library/Frameworks/AGL.framework/" "${AGL}/Library/Frameworks/AGL.framework/" | ||
| substituteInPlace configure \ | ||
| --replace-fail '/usr/bin/xcode-select' '${lib.getBin xcbuild}/bin/xcode-select' \ |
There was a problem hiding this comment.
We could also use lib.getExe'
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/title-the-darwin-sdks-have-been-updated/55295/1 |
Qt 5.15 needs to know the exact location of the OpenGL framework, so it needs updated for the new SDK pattern. I also updated Qt 6. Both are examples of how the new Darwin SDK can simplify derivations and improve support (e.g., Qt WebEngine builds again on Darwin).
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.