libsForQt5.*: consistently build with the macOS 13 SDK
This was changed for `qtbase` in
3be309eff1
, but affects Qt WebEngine
as well.
This commit is contained in:
parent
ed28ebdbb4
commit
4e3c8f45a5
@ -20,7 +20,7 @@
|
||||
, systemd
|
||||
, enableProprietaryCodecs ? true
|
||||
, gn
|
||||
, apple-sdk_13, cctools, cups, bootstrap_cmds, xcbuild, writeScriptBin
|
||||
, cctools, cups, bootstrap_cmds, xcbuild, writeScriptBin
|
||||
, ffmpeg ? null
|
||||
, lib, stdenv
|
||||
, version ? null
|
||||
@ -51,8 +51,7 @@ let
|
||||
|
||||
in
|
||||
|
||||
# Override the SDK because Qt WebEngine doesn’t seem to build using the 14.4 SDK.
|
||||
(qtModule.override { apple-sdk_for_qt = apple-sdk_13; }) ({
|
||||
qtModule ({
|
||||
pname = "qtwebengine";
|
||||
nativeBuildInputs = [
|
||||
bison flex git gperf ninja pkg-config (python.withPackages(ps: [ ps.html5lib ])) which gn nodejs
|
||||
|
@ -2,8 +2,8 @@
|
||||
, stdenv
|
||||
, buildPackages
|
||||
, mkDerivation
|
||||
, apple-sdk_14
|
||||
, apple-sdk_for_qt ? apple-sdk_14
|
||||
, apple-sdk_13
|
||||
, darwinMinVersionHook
|
||||
, perl
|
||||
, qmake
|
||||
, patches
|
||||
@ -28,7 +28,9 @@ mkDerivation (args // {
|
||||
buildInputs =
|
||||
args.buildInputs or [ ]
|
||||
# Per https://doc.qt.io/qt-5/macos.html#supported-versions
|
||||
++ lib.optionals stdenv.isDarwin [ apple-sdk_for_qt ];
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
apple-sdk_13
|
||||
];
|
||||
|
||||
nativeBuildInputs =
|
||||
(args.nativeBuildInputs or []) ++ [
|
||||
|
Loading…
Reference in New Issue
Block a user