From d4f7b842c6eb8a34930566274249602964a301fc Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 8 Oct 2024 13:23:30 +0300 Subject: [PATCH 1/3] qt6: 6.7.3 -> 6.8.0 --- pkgs/development/libraries/qt-6/fetch.sh | 2 +- .../libraries/qt-6/modules/qtmqtt.nix | 4 +- .../libraries/qt-6/modules/qtwayland.nix | 13 +- .../libraries/qt-6/modules/qtwebengine.nix | 9 - ...-qtbase-qmake-fix-mkspecs-for-darwin.patch | 62 ++-- .../fix-qtgui-include-incorrect-case.patch | 4 +- .../patches/qtwebengine-link-pulseaudio.patch | 22 +- pkgs/development/libraries/qt-6/srcs.nix | 314 +++++++++--------- 8 files changed, 195 insertions(+), 235 deletions(-) diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index b91fd89f80e4..8ae22eecfa05 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.3/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.8/6.8.0/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index c33fc9a4499d..80eef148701a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,13 +5,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.7.3"; + version = "6.8.0"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-QVLt1nhxYIMmmVY1rZ8pnkXNs0N6hp1o8rv33o8ptxM="; + hash = "sha256-WvqBEq7Zv1CONMMuDHdj8/nJHoY4y7ysrqliTZHi7x8="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 771680233d16..54346345e4e3 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -5,7 +5,6 @@ , wayland-scanner , pkg-config , libdrm -, fetchpatch }: qtModule { @@ -18,11 +17,9 @@ qtModule { buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; - patches = [ - # Update wayland.xml to version 1.23.0 - (fetchpatch { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/c2f61bc47baacf2e6a44c6c3c4e4cbf0abfa4095.diff"; - sha256 = "sha256-ZcK/LT65oFvTzCukZB8aDYWH5L6RK5MOPs8VtpYQpq0="; - }) - ]; + # Replace vendored wayland.xml with our matching version + # FIXME: remove when upstream updates past 1.23 + postPatch = '' + cp ${wayland-scanner}/share/wayland/wayland.xml src/3rdparty/protocol/wayland/wayland.xml + ''; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 46cc19012c1f..11a70e53bfcd 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -3,7 +3,6 @@ , qtwebchannel , qtpositioning , qtwebsockets -, fetchpatch2 , buildPackages , bison , coreutils @@ -132,14 +131,6 @@ qtModule { # Override locales install path so they go to QtWebEngine's $out ../patches/qtwebengine-locales-path.patch - - # Support FFmpeg 7 - (fetchpatch2 { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-webengine/-/raw/6bee5464ac6340e925e08c7ed023026e727ae9d5/qtwebengine-ffmpeg-7.patch"; - hash = "sha256-OdCIu1KMW3YcpCnfUP1uD7OJRl6Iwap9X4aJhGpoaNs="; - stripLen = 1; - extraPrefix = "src/3rdparty/chromium/"; - }) ]; postPatch = '' diff --git a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index 1e548950a2a6..fbe49379533b 100644 --- a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -1,19 +1,5 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Fri, 14 Apr 2023 21:43:04 +0800 -Subject: [PATCH] qtbase: qmake: fix mkspecs for darwin - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 264 -------------------------- - mkspecs/features/mac/default_pre.prf | 58 ------ - mkspecs/features/mac/sdk.mk | 27 --- - mkspecs/features/mac/sdk.prf | 61 ------ - mkspecs/features/mac/toolchain.prf | 5 - - 6 files changed, 1 insertion(+), 416 deletions(-) - diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b22..9909dae7260 100644 +index 61bea952b2..9909dae726 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -26,20 +12,10 @@ index 61bea952b22..9909dae7260 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 0b64a586b93..3b40328304d 100644 +index 22c84d6473..4d46762bec 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -1,9 +1,5 @@ - load(default_post) - --# Recompute SDK version in case the user set it explicitly --sdk_version = $$QMAKE_MAC_SDK_VERSION --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- - contains(TEMPLATE, .*app) { - !macx-xcode:if(isEmpty(BUILDS)|build_pass) { - # Detect changes to the platform SDK -@@ -15,270 +11,10 @@ contains(TEMPLATE, .*app) { +@@ -15,278 +15,10 @@ contains(TEMPLATE, .*app) { QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) } @@ -148,10 +124,12 @@ index 0b64a586b93..3b40328304d 100644 - - QMAKE_XCODE_ARCHS = - -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device +- !isEmpty(QMAKE_APPLE_DEVICE_ARCHS) { +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- } - - ios:simulator { - arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" @@ -252,10 +230,16 @@ index 0b64a586b93..3b40328304d 100644 - platform_identifier = $$device.sdk - sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) - } -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_CFLAGS += -isysroot $$sysroot_path +- QMAKE_CXXFLAGS += -isysroot $$sysroot_path +- QMAKE_LFLAGS += -isysroot $$sysroot_path +- +- !isEmpty(version_identifier):!isEmpty(deployment_target) { +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += $$version_min_flag +- QMAKE_CXXFLAGS += $$version_min_flag +- QMAKE_LFLAGS += $$version_min_flag +- } - } - - # Enable precompiled headers for multiple architectures @@ -311,7 +295,7 @@ index 0b64a586b93..3b40328304d 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a56..3b01424e67b 100644 +index e3534561a5..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ @@ -376,7 +360,7 @@ index e3534561a56..3b01424e67b 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index a32ceacb6ce..e69de29bb2d 100644 +index a32ceacb6c..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,27 +0,0 @@ @@ -408,7 +392,7 @@ index a32ceacb6ce..e69de29bb2d 100644 - endif -endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bbe..e69de29bb2d 100644 +index 3a9c2778bb..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -1,61 +0,0 @@ @@ -474,7 +458,7 @@ index 3a9c2778bbe..e69de29bb2d 100644 - cache($$tool_variable, set stash, $$tool) -} diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c4..e69de29bb2d 100644 +index df191eb13c..e69de29bb2 100644 --- a/mkspecs/features/mac/toolchain.prf +++ b/mkspecs/features/mac/toolchain.prf @@ -1,5 +0,0 @@ diff --git a/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch b/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch index 563906fb3157..5540ed8d77da 100644 --- a/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch +++ b/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch @@ -1,11 +1,11 @@ diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp -index affa52d..b71b461 100644 +index c90dabb53..12557976d 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp @@ -7,7 +7,7 @@ - #include #include #include + #include -#include +#include #include "qvideoframe.h" diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch index c4302113786e..a48bb2c37eee 100644 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch +++ b/pkgs/development/libraries/qt-6/patches/qtwebengine-link-pulseaudio.patch @@ -1,24 +1,12 @@ -From da66a74e8b8e57b4a60b2cd0d18ef3bebb15509c Mon Sep 17 00:00:00 2001 -From: Nick Cao -Date: Tue, 10 Oct 2023 11:45:24 -0400 -Subject: [PATCH 1/2] qtwebengine: link pulseaudio - ---- - src/core/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 4153ce180..e89f41798 100644 +index de5222645..bddb2322a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt -@@ -340,6 +340,7 @@ foreach(arch ${archs}) - use_static_angle=true - chrome_root_store_supported=false - trial_comparison_cert_verifier_supported=false +@@ -366,6 +366,7 @@ foreach(arch ${archs}) + content_enable_legacy_ipc=true + enable_extensions_legacy_ipc=true + enable_bound_session_credentials=false + link_pulseaudio=true ) extend_gn_list(gnArgArg ARGS use_v8_context_snapshot v8_use_external_startup_data --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 234fb3afeb31..5f5d27318e71 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -1,318 +1,318 @@ # DO NOT EDIT! This file is generated automatically. -# Command: /home/k900/gh/NixOS/nixpkgs/./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 +# Command: /home/k900/nixpkgs/./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 { fetchurl, mirror }: { qt3d = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qt3d-everywhere-src-6.7.3.tar.xz"; - sha256 = "155nddckcc94klwsn51s9p8ynk1acg7q9dx99blhq7ch98vqrm25"; - name = "qt3d-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt3d-everywhere-src-6.8.0.tar.xz"; + sha256 = "0zbv1j0i9bla73b4v15skjballff2l0lxgrdfhdkaz232ng9249s"; + name = "qt3d-everywhere-src-6.8.0.tar.xz"; }; }; qt5compat = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qt5compat-everywhere-src-6.7.3.tar.xz"; - sha256 = "1w2k7911n20wdgl3lmxwc7h8sbn7jkjwxz6sl089szmavyinhslb"; - name = "qt5compat-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qt5compat-everywhere-src-6.8.0.tar.xz"; + sha256 = "0c2yhgsn63a5m0pxchmkkqfb7izllpr46srf2pndcsqbszyhb6rw"; + name = "qt5compat-everywhere-src-6.8.0.tar.xz"; }; }; qtactiveqt = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtactiveqt-everywhere-src-6.7.3.tar.xz"; - sha256 = "03qsszrsv3x2w9v65wnmizyqbs0x13c00zjd7sfgsaxw20p5x11a"; - name = "qtactiveqt-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtactiveqt-everywhere-src-6.8.0.tar.xz"; + sha256 = "0nycsn0yim01cvinfaljwmx8rllll6xw62cywqhbz61fqlsdy693"; + name = "qtactiveqt-everywhere-src-6.8.0.tar.xz"; }; }; qtbase = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtbase-everywhere-src-6.7.3.tar.xz"; - sha256 = "15rhv8irwpgxs0pgqsn5dy9ndz6n3vfyv7iccdvaq1aj0nmvkjwc"; - name = "qtbase-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtbase-everywhere-src-6.8.0.tar.xz"; + sha256 = "0x9wp9fd37ycpw73s03p01zi19l93xjp57vcvrrgh9xa20blib8v"; + name = "qtbase-everywhere-src-6.8.0.tar.xz"; }; }; qtcharts = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtcharts-everywhere-src-6.7.3.tar.xz"; - sha256 = "0n9n4gj86g86yqkgws12aw2p6d94lmx6y19qki5gmg76a2jn7sh7"; - name = "qtcharts-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtcharts-everywhere-src-6.8.0.tar.xz"; + sha256 = "0bqkbd31lxyqiw4nbwrach7hixg3q93v26di9hxb0s8s1nndl8qr"; + name = "qtcharts-everywhere-src-6.8.0.tar.xz"; }; }; qtconnectivity = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtconnectivity-everywhere-src-6.7.3.tar.xz"; - sha256 = "1igwnbjhdwmaw1x4v0gx9wv4h4a5h9f9rv9m9dyi0ybv14prpyc0"; - name = "qtconnectivity-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtconnectivity-everywhere-src-6.8.0.tar.xz"; + sha256 = "120pq8yvm4v72800cj0mm8069fiyan036arnc74zq1vmq1ngpgmv"; + name = "qtconnectivity-everywhere-src-6.8.0.tar.xz"; }; }; qtdatavis3d = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtdatavis3d-everywhere-src-6.7.3.tar.xz"; - sha256 = "108x4hafvrc4jpmmx6lcf7mnns7vkgz0004b6qkw5bzq36apdwp1"; - name = "qtdatavis3d-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdatavis3d-everywhere-src-6.8.0.tar.xz"; + sha256 = "1zscaf1f4dfc5v8w8bivac5hnbq4j6j70vf78b5dcy5h2dfrdwim"; + name = "qtdatavis3d-everywhere-src-6.8.0.tar.xz"; }; }; qtdeclarative = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtdeclarative-everywhere-src-6.7.3.tar.xz"; - sha256 = "0xcq1dhws5k1sdf8iwxc2j2s45171rhjckfla17brxdb87j70ywk"; - name = "qtdeclarative-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdeclarative-everywhere-src-6.8.0.tar.xz"; + sha256 = "1hj4asdzkm78v0mfwyvh847j010mb43i3xx11nma66g989ms6h9v"; + name = "qtdeclarative-everywhere-src-6.8.0.tar.xz"; }; }; qtdoc = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtdoc-everywhere-src-6.7.3.tar.xz"; - sha256 = "0113rrsrcaw5l425xv96z081idjpav2iprg1834pxfqk3wk2l3ak"; - name = "qtdoc-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtdoc-everywhere-src-6.8.0.tar.xz"; + sha256 = "0mqjki77cbm14jxxh750p6h7kixkma1nsimdl97b4lslcrs3mj1x"; + name = "qtdoc-everywhere-src-6.8.0.tar.xz"; }; }; qtgraphs = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtgraphs-everywhere-src-6.7.3.tar.xz"; - sha256 = "13vcx0fkx9vyvjysnj0n805x13ir1srbzlg1jha8h56ccg6dw2f3"; - name = "qtgraphs-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgraphs-everywhere-src-6.8.0.tar.xz"; + sha256 = "0hnb1nb8bdhjkrr3b64dk9wgkdgnrb8bxdafvizy2gsr0rd4m9ab"; + name = "qtgraphs-everywhere-src-6.8.0.tar.xz"; }; }; qtgrpc = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtgrpc-everywhere-src-6.7.3.tar.xz"; - sha256 = "1py6h4g5zhqpm99bhxk12paw675a4c6dl95s6nwkvg1y2vaavapf"; - name = "qtgrpc-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtgrpc-everywhere-src-6.8.0.tar.xz"; + sha256 = "0zgli0y52n5ahiahkmr1439c5vmjjv69f1x6vw4jbhc3xkp4lnvx"; + name = "qtgrpc-everywhere-src-6.8.0.tar.xz"; }; }; qthttpserver = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qthttpserver-everywhere-src-6.7.3.tar.xz"; - sha256 = "1zyyyj9q0yy5gh28yqgc0nwhgdvg0qbwkag9bd566srbwp3if8vz"; - name = "qthttpserver-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qthttpserver-everywhere-src-6.8.0.tar.xz"; + sha256 = "0zvrmqdch8mgpz3xbql3qy6zivyg8f0h10h86di90p1ssb40ihw1"; + name = "qthttpserver-everywhere-src-6.8.0.tar.xz"; }; }; qtimageformats = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtimageformats-everywhere-src-6.7.3.tar.xz"; - sha256 = "0ls76bxl3xhy7hyzw53vj8q3h0llsbm9dpb86wvw6m0n11283mcz"; - name = "qtimageformats-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtimageformats-everywhere-src-6.8.0.tar.xz"; + sha256 = "1m55966458jf5n7hciahzw8fdix3d2cf1w96qzmziqcigdazhnsr"; + name = "qtimageformats-everywhere-src-6.8.0.tar.xz"; }; }; qtlanguageserver = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtlanguageserver-everywhere-src-6.7.3.tar.xz"; - sha256 = "13yzz6qnpkah9s89xlqiszzkbw1j6c1a2vzwkgjdj0w589r3hvf5"; - name = "qtlanguageserver-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlanguageserver-everywhere-src-6.8.0.tar.xz"; + sha256 = "1vsw0q0pb7dbxhpg1df0bandfy7k62l68pi063fxpld4ihn1bxzv"; + name = "qtlanguageserver-everywhere-src-6.8.0.tar.xz"; }; }; qtlocation = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtlocation-everywhere-src-6.7.3.tar.xz"; - sha256 = "1657scmrkyhm31fgvgpjlqd053gb7bcywra4qvlgg3h4rpfxg7sn"; - name = "qtlocation-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlocation-everywhere-src-6.8.0.tar.xz"; + sha256 = "181ijzpx4xav5j282w2ppa9g5wdc4z13q0r7269flrb9ngs8gi50"; + name = "qtlocation-everywhere-src-6.8.0.tar.xz"; }; }; qtlottie = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtlottie-everywhere-src-6.7.3.tar.xz"; - sha256 = "03c3s6alabqqqhi8cx8rnkr3gx7h8rcf2wn8iy9n7hbsfrvix39r"; - name = "qtlottie-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtlottie-everywhere-src-6.8.0.tar.xz"; + sha256 = "15kw2cgxqh8mhip0838yalbpfnp4pd000sdalgxvc53bd8wycsfb"; + name = "qtlottie-everywhere-src-6.8.0.tar.xz"; }; }; qtmultimedia = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtmultimedia-everywhere-src-6.7.3.tar.xz"; - sha256 = "00vkazz4mcz5n2hdh10y9mh0fi2kygai009vi69m4hwjwnw2hk9h"; - name = "qtmultimedia-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtmultimedia-everywhere-src-6.8.0.tar.xz"; + sha256 = "1kfgfcnihn0rqnjdif4n0hd8j2p9xkbfy3a2m3gsfypscajnlxi8"; + name = "qtmultimedia-everywhere-src-6.8.0.tar.xz"; }; }; qtnetworkauth = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtnetworkauth-everywhere-src-6.7.3.tar.xz"; - sha256 = "1dqk9983cjf3kiprk053xn3np2c25044dlfdrzs5d742x2jpb6kb"; - name = "qtnetworkauth-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtnetworkauth-everywhere-src-6.8.0.tar.xz"; + sha256 = "0j6ch2p6c2b6akg0hq7iy96v118rypz77573bf4mvcy68ijmcpdr"; + name = "qtnetworkauth-everywhere-src-6.8.0.tar.xz"; }; }; qtpositioning = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtpositioning-everywhere-src-6.7.3.tar.xz"; - sha256 = "0736qsf7k3dqdm9gd7xc0l368h45jgzh4nzz72wizj9489sp6w6s"; - name = "qtpositioning-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtpositioning-everywhere-src-6.8.0.tar.xz"; + sha256 = "0fgbgsg1hnwnm7bbp0j41nlpmz9g65nwj48v2c8mjiq15cz4d0gc"; + name = "qtpositioning-everywhere-src-6.8.0.tar.xz"; }; }; qtquick3d = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtquick3d-everywhere-src-6.7.3.tar.xz"; - sha256 = "0mwrlz9ji0ivnxz44m9xhhsk7lngxjnmid420s359vs21msik6ni"; - name = "qtquick3d-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3d-everywhere-src-6.8.0.tar.xz"; + sha256 = "0gr2y030phghpniw7flr90f4kckiksq39y53dwddncysw970959y"; + name = "qtquick3d-everywhere-src-6.8.0.tar.xz"; }; }; qtquick3dphysics = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtquick3dphysics-everywhere-src-6.7.3.tar.xz"; - sha256 = "1wyqi6z0g2pi0wj288ssjj0awn8jpi9rqa8bi510s9vr625w8pdl"; - name = "qtquick3dphysics-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquick3dphysics-everywhere-src-6.8.0.tar.xz"; + sha256 = "07wmy546hwavbpy368pyk0qgj79sqykqkcsnmv802qp7kwi5rcqk"; + name = "qtquick3dphysics-everywhere-src-6.8.0.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtquickeffectmaker-everywhere-src-6.7.3.tar.xz"; - sha256 = "15if8ansjc1nkpaf6ldyydb47grgv079pm15ljn0ykf35ldzv2sq"; - name = "qtquickeffectmaker-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquickeffectmaker-everywhere-src-6.8.0.tar.xz"; + sha256 = "1x3lijsfd8pv74sgyjc7cj9s0c2q9bf49r44aa2d0zdjs3rxg8ca"; + name = "qtquickeffectmaker-everywhere-src-6.8.0.tar.xz"; }; }; qtquicktimeline = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtquicktimeline-everywhere-src-6.7.3.tar.xz"; - sha256 = "00n90camzs7c3s61id58466sypc83w0101wrnw0xwlaci1kld45p"; - name = "qtquicktimeline-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtquicktimeline-everywhere-src-6.8.0.tar.xz"; + sha256 = "020zv4fnx37k8nm0c462bk8r9ma7l6ivr8j7i82h6688v0ds81hi"; + name = "qtquicktimeline-everywhere-src-6.8.0.tar.xz"; }; }; qtremoteobjects = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtremoteobjects-everywhere-src-6.7.3.tar.xz"; - sha256 = "1lciziv5qvnxich39j0q46v3pkn83yy1jkm2q3d10k5672lqmh4r"; - name = "qtremoteobjects-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtremoteobjects-everywhere-src-6.8.0.tar.xz"; + sha256 = "123mkiak4xj05yg6sg86z1hixp8vycj0yks1fj1yk5lpdl65gpzi"; + name = "qtremoteobjects-everywhere-src-6.8.0.tar.xz"; }; }; qtscxml = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtscxml-everywhere-src-6.7.3.tar.xz"; - sha256 = "18zdgq3sapkh6jsnfhl0xm0r8ydbg7kxwr70b7szpdmg1pmyp3v0"; - name = "qtscxml-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtscxml-everywhere-src-6.8.0.tar.xz"; + sha256 = "0fxl6yc03z43x49nskm2r1wa7vq9zg6dv1hl74nipc21yi7amadv"; + name = "qtscxml-everywhere-src-6.8.0.tar.xz"; }; }; qtsensors = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtsensors-everywhere-src-6.7.3.tar.xz"; - sha256 = "1z68yfjljv7bi49kna4a7yz6javw9bqdw0jr30zmzvb2ldfqsfn0"; - name = "qtsensors-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsensors-everywhere-src-6.8.0.tar.xz"; + sha256 = "0yg6vn1yk4k962bff33pk9pjzyw3rskqcqfnadfvgyh5zb2l8dbj"; + name = "qtsensors-everywhere-src-6.8.0.tar.xz"; }; }; qtserialbus = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtserialbus-everywhere-src-6.7.3.tar.xz"; - sha256 = "0xk218y1cm9icdzb4dn9nvszr9n22anmf2iz72vhhy42gaf2xn2m"; - name = "qtserialbus-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialbus-everywhere-src-6.8.0.tar.xz"; + sha256 = "1ynsy0xkjdp5d3rii0ch540n8cs07dzwd66cxw59gh9j92839676"; + name = "qtserialbus-everywhere-src-6.8.0.tar.xz"; }; }; qtserialport = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtserialport-everywhere-src-6.7.3.tar.xz"; - sha256 = "1w26n5nw8fv9cq258xm0p7niisbig5ky83njm3nwjfcvh3p5iynl"; - name = "qtserialport-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtserialport-everywhere-src-6.8.0.tar.xz"; + sha256 = "1hz7fynpa6z0x206g920xfk45hi74fahpcyha1f09cddrwpdfrvp"; + name = "qtserialport-everywhere-src-6.8.0.tar.xz"; }; }; qtshadertools = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtshadertools-everywhere-src-6.7.3.tar.xz"; - sha256 = "1589ij1aarr0i6cfbdxg8yxvljs52599g39d98sxmnvxiiwi5rbl"; - name = "qtshadertools-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtshadertools-everywhere-src-6.8.0.tar.xz"; + sha256 = "1jy4siv6ny9wgs5bcn19z05my9q8za0wi5lyngrlndw26k4jssa4"; + name = "qtshadertools-everywhere-src-6.8.0.tar.xz"; }; }; qtspeech = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtspeech-everywhere-src-6.7.3.tar.xz"; - sha256 = "04h998pshs2bzm3a0bvmkq2an2yhgfrap22k3lvprx3f3gsgn2gn"; - name = "qtspeech-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtspeech-everywhere-src-6.8.0.tar.xz"; + sha256 = "0rb52qbwjkxlncz28rcjapi059b8px3i5haq71gm7f1pph90l8vm"; + name = "qtspeech-everywhere-src-6.8.0.tar.xz"; }; }; qtsvg = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtsvg-everywhere-src-6.7.3.tar.xz"; - sha256 = "0sx0xm6hcjhjhrmswycrgwvdjk6mymkindmw2bb7mq5i3yvjq520"; - name = "qtsvg-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtsvg-everywhere-src-6.8.0.tar.xz"; + sha256 = "16b1ckqpfhzn9xaqbwz5gy4b0xavbpjxj4064ivq23sjbqymjyng"; + name = "qtsvg-everywhere-src-6.8.0.tar.xz"; }; }; qttools = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qttools-everywhere-src-6.7.3.tar.xz"; - sha256 = "0gr06dr3dd334mswrjdxp27dhpdbpjvk03hipafsrncwc7gvffzh"; - name = "qttools-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttools-everywhere-src-6.8.0.tar.xz"; + sha256 = "1xw1k7rnm2yylbj08p9a0w2ydfcfwa50qca3dv6cc0w54vc1aca0"; + name = "qttools-everywhere-src-6.8.0.tar.xz"; }; }; qttranslations = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qttranslations-everywhere-src-6.7.3.tar.xz"; - sha256 = "1j3dklf0gvzpnl6zw254fv7wy3iyypbbcsfkwjsrnfq4mjn65iyw"; - name = "qttranslations-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qttranslations-everywhere-src-6.8.0.tar.xz"; + sha256 = "1dkw8f3hcnmnnv0ia62i5189dcgjkpx7pkcal180rka3q9kjpgw4"; + name = "qttranslations-everywhere-src-6.8.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz"; - sha256 = "1n932jgj97ili5chhfrscqvhdaz0na5yla3xljnlih0jw82231qs"; - name = "qtvirtualkeyboard-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz"; + sha256 = "1q0cdmxm4j9w6lhm1k1ayjykknl6kmzr415qc14znr87ykbh4rcg"; + name = "qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz"; }; }; qtwayland = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwayland-everywhere-src-6.7.3.tar.xz"; - sha256 = "1ddjf9lrlx8cp0699sq8vc8fx44nvz9daxq5qazh7x98nv7cf9p3"; - name = "qtwayland-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwayland-everywhere-src-6.8.0.tar.xz"; + sha256 = "02h6lak0cp87b76474ifsm78vsx0gwfc2smnzg3g3srq2rcmhmqp"; + name = "qtwayland-everywhere-src-6.8.0.tar.xz"; }; }; qtwebchannel = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwebchannel-everywhere-src-6.7.3.tar.xz"; - sha256 = "1f3lak91fvlncgs43dcgkgjg25f9449d2pvbsh33m6xhdpg3yqqm"; - name = "qtwebchannel-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebchannel-everywhere-src-6.8.0.tar.xz"; + sha256 = "1h30mzmhkbcjaj4wivway0ldrdidqyg2b79313v2m3capwjhs9fn"; + name = "qtwebchannel-everywhere-src-6.8.0.tar.xz"; }; }; qtwebengine = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwebengine-everywhere-src-6.7.3.tar.xz"; - sha256 = "1ns6v24jarjlvd1b3nh4x3sp6y38ag62dsh7x6f5dp40pff1aay2"; - name = "qtwebengine-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebengine-everywhere-src-6.8.0.tar.xz"; + sha256 = "0lklgz5i3ryl6d1ghy11rvmg9isbzvrvx007nwb4qqm89294b114"; + name = "qtwebengine-everywhere-src-6.8.0.tar.xz"; }; }; qtwebsockets = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwebsockets-everywhere-src-6.7.3.tar.xz"; - sha256 = "03lrqphvn0bwrma8rjqb8x7giqgk24gdgl9v7syaas7fnxyh00xs"; - name = "qtwebsockets-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebsockets-everywhere-src-6.8.0.tar.xz"; + sha256 = "0vxgbqxahay0gz5cv3fl075qw3flm3hgz1srhs4jl75p8rff0jy1"; + name = "qtwebsockets-everywhere-src-6.8.0.tar.xz"; }; }; qtwebview = { - version = "6.7.3"; + version = "6.8.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.7/6.7.3/submodules/qtwebview-everywhere-src-6.7.3.tar.xz"; - sha256 = "0bdr0m8453difqwd8gvgqsd4df4j8lnlbi44cdazwhx28kzfi2kh"; - name = "qtwebview-everywhere-src-6.7.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.8/6.8.0/submodules/qtwebview-everywhere-src-6.8.0.tar.xz"; + sha256 = "1wvrq7lf688hqvq102kyvx7kqnixxp6w25cb6rvb2xiqb50rvf3w"; + name = "qtwebview-everywhere-src-6.8.0.tar.xz"; }; }; } From 38fb2331ad7e14d114ffefa6169c098ffb8ccd76 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 8 Oct 2024 14:12:49 +0300 Subject: [PATCH 2/3] maintainers/scripts/fetch-kde-qt.sh: hardcode path instead of using $0 --- maintainers/scripts/fetch-kde-qt.sh | 2 +- pkgs/development/libraries/qt-6/srcs.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index c43e8ad904d7..b5d49f835038 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -156,7 +156,7 @@ files_before=$(grep -c 'src = ' "$SRCS") echo "writing output file $SRCS ..." cat >"$SRCS" < Date: Tue, 8 Oct 2024 15:24:45 +0300 Subject: [PATCH 3/3] qt6: build with Apple SDK 12.3 This is still multiple versions behind where we should be, but it is the latest we've got (for now, anyway), and 11.0 doesn't build at all. --- pkgs/development/libraries/qt-6/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 8625dadf5233..51bd83a99d19 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -29,7 +29,7 @@ let inherit srcs python3; stdenv = if stdenv.hostPlatform.isDarwin - then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } + then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "12.3"; } else stdenv; }); in @@ -42,7 +42,7 @@ let qtbase = callPackage ./modules/qtbase.nix { withGtk3 = !stdenv.hostPlatform.isMinGW; inherit (srcs.qtbase) src version; - inherit (darwin.apple_sdk_11_0.frameworks) + inherit (darwin.apple_sdk_12_3.frameworks) AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit; patches = [ ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch @@ -113,7 +113,7 @@ let qt5compat = callPackage ./modules/qt5compat.nix { }; qtcharts = callPackage ./modules/qtcharts.nix { }; qtconnectivity = callPackage ./modules/qtconnectivity.nix { - inherit (darwin.apple_sdk_11_0.frameworks) IOBluetooth PCSC; + inherit (darwin.apple_sdk_12_3.frameworks) IOBluetooth PCSC; }; qtdatavis3d = callPackage ./modules/qtdatavis3d.nix { }; qtdeclarative = callPackage ./modules/qtdeclarative.nix { }; @@ -127,7 +127,7 @@ let qtlottie = callPackage ./modules/qtlottie.nix { }; qtmultimedia = callPackage ./modules/qtmultimedia.nix { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi; - inherit (darwin.apple_sdk_11_0.frameworks) VideoToolbox; + inherit (darwin.apple_sdk_12_3.frameworks) VideoToolbox; }; qtmqtt = callPackage ./modules/qtmqtt.nix { }; qtnetworkauth = callPackage ./modules/qtnetworkauth.nix { }; @@ -137,7 +137,7 @@ let qtserialport = callPackage ./modules/qtserialport.nix { }; qtshadertools = callPackage ./modules/qtshadertools.nix { }; qtspeech = callPackage ./modules/qtspeech.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; + inherit (darwin.apple_sdk_12_3.frameworks) Cocoa; }; qtquick3d = callPackage ./modules/qtquick3d.nix { }; qtquick3dphysics = callPackage ./modules/qtquick3dphysics.nix { }; @@ -153,9 +153,9 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind; - inherit (darwin.apple_sdk_11_0.libs) sandbox; - inherit (darwin.apple_sdk_11_0.frameworks) + inherit (darwin.apple_sdk_12_3) libpm libunwind; + inherit (darwin.apple_sdk_12_3.libs) sandbox; + inherit (darwin.apple_sdk_12_3.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz @@ -174,7 +174,7 @@ let }; qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; qtwebview = callPackage ./modules/qtwebview.nix { - inherit (darwin.apple_sdk_11_0.frameworks) WebKit; + inherit (darwin.apple_sdk_12_3.frameworks) WebKit; }; wrapQtAppsHook = callPackage