diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/qt-6')
29 files changed, 365 insertions, 423 deletions
diff --git a/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/nixpkgs/pkgs/development/libraries/qt-6/default.nix index ea65e5f3ae82..c4b851207954 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -15,10 +15,6 @@ , buildPackages , python3 , config - - # options -, developerBuild ? false -, debug ? false }: let @@ -32,7 +28,10 @@ let callPackage = self.newScope ({ inherit (self) qtModule; inherit srcs python3; - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = + if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } + else stdenv; }); in { @@ -44,21 +43,19 @@ let qtbase = callPackage ./modules/qtbase.nix { withGtk3 = !stdenv.hostPlatform.isMinGW; inherit (srcs.qtbase) src version; - inherit developerBuild; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation AppKit Contacts CoreBluetooth EventKit GSS MetalKit; patches = [ ./patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch ./patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch ./patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch - ./patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch - ./patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch - ./patches/0006-qtbase-find-tools-in-PATH.patch - ./patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch - ./patches/0008-qtbase-allow-translations-outside-prefix.patch - ./patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch - ./patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch - ./patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch + ./patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch + ./patches/0005-qtbase-find-tools-in-PATH.patch + ./patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch + ./patches/0007-qtbase-allow-translations-outside-prefix.patch + ./patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch + ./patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch + ./patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch # Revert "macOS: Silence warning about supporting secure state restoration" # fix build with macOS sdk < 12.0 (fetchpatch2 { @@ -168,7 +165,7 @@ let ({ qtModule }: qtModule.override { stdenv = if stdenv.isDarwin - then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + then overrideSDK stdenv { darwinMinVersion = "11.0"; darwinSdkVersion = "11.0"; } else stdenv; }) { }; @@ -195,16 +192,13 @@ let name = "qmake6-hook"; propagatedBuildInputs = [ qtbase.dev ]; substitutions = { - inherit debug; fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; }; } ./hooks/qmake-hook.sh) { }; } // lib.optionalAttrs config.allowAliases { - # Convert to a throw on 03-01-2023 and backport the change. - # Warnings show up in various cli tool outputs, throws do not. - # Remove completely before 24.05 - overrideScope' = lib.warnIf (lib.isInOldestRelease 2311) "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"." self.overrideScope; + # Remove completely before 24.11 + overrideScope' = builtins.throw "qt6 now uses makeScopeWithSplicing which does not have \"overrideScope'\", use \"overrideScope\"."; }; baseScope = makeScopeWithSplicing' { diff --git a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh index 52c6fb5f1b2e..a9c84b483238 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.3/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh index 8c4ce096443f..130e8290a3fe 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh +++ b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh @@ -18,12 +18,6 @@ qmakePrePhase() { "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" ) - if [ -n "@debug@" ]; then - qmakeFlags+=("CONFIG+=debug") - else - qmakeFlags+=("CONFIG+=release") - fi - qmakeFlags+=("${qmakeFlags_orig[@]}") } prePhases+=" qmakePrePhase" diff --git a/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh index 9bc68e6cd3d6..5006d6b65530 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh +++ b/nixpkgs/pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh @@ -15,20 +15,6 @@ else # Only set up Qt once. . @fix_qt_builtin_paths@ . @fix_qt_module_paths@ - # Disable debug symbols if qtbase was built without debugging. - # This stops -dev paths from leaking into other outputs. - if [ -z "@debug@" ]; then - NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-DQT_NO_DEBUG" - fi - - # Integration with CMake: - # Set the CMake build type corresponding to how qtbase was built. - if [ -n "@debug@" ]; then - cmakeBuildType="Debug" - else - cmakeBuildType="Release" - fi - # Build tools are often confused if QMAKE is unset. export QMAKE=@out@/bin/qmake diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index a14028e1259a..a327b88991ef 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -92,13 +92,10 @@ # options , libGLSupported ? stdenv.hostPlatform.isLinux , libGL -, debug ? false -, developerBuild ? false , qttranslations ? null }: let - debugSymbols = debug || developerBuild; isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; in stdenv.mkDerivation rec { @@ -106,8 +103,6 @@ stdenv.mkDerivation rec { inherit src version; - debug = debugSymbols; - propagatedBuildInputs = [ libxml2 libxslt @@ -195,7 +190,6 @@ stdenv.mkDerivation rec { CoreBluetooth ] ++ lib.optional withGtk3 gtk3 - ++ lib.optional developerBuild gdb ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; @@ -266,8 +260,6 @@ stdenv.mkDerivation rec { patchelf --add-rpath "${libmysqlclient}/lib/mariadb" $out/${qtPluginPrefix}/sqldrivers/libqsqlmysql.so ''; - dontStrip = debugSymbols; - dontWrapQtApps = true; setupHook = ../hooks/qtbase-setup-hook.sh; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index 697556e30edc..e1ed990dc0b3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -3,16 +3,28 @@ , qtlanguageserver , qtshadertools , openssl +, stdenv , python3 +, lib +, pkgsBuildBuild }: qtModule { pname = "qtdeclarative"; - propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl python3 ]; + strictDeps = !stdenv.isDarwin; # fails to detect python3 otherwise + propagatedBuildInputs = [ qtbase qtlanguageserver qtshadertools openssl ]; + nativeBuildInputs = [ python3 ]; patches = [ # prevent headaches from stale qmlcache data - ../patches/qtdeclarative-default-disable-qmlcache.patch + ../patches/0001-qtdeclarative-disable-qml-disk-cache.patch # add version specific QML import path - ../patches/qtdeclarative-qml-paths.patch + ../patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch + ]; + cmakeFlags = [ + "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools" + ] + # Conditional is required to prevent infinite recursion during a cross build + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "-DQt6QmlTools_DIR=${pkgsBuildBuild.qt6.qtdeclarative}/lib/cmake/Qt6QmlTools" ]; } diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index a9660b73710b..fc12a5fb1112 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,13 +5,13 @@ qtModule rec { pname = "qtmqtt"; - version = "6.6.2"; + version = "6.7.0"; src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-R8B7Vt/XzI7+17DDZ+TVbqfGKdEfUMiLa1BqzIbo4OM="; + hash = "sha256-LUYb4Wb1fLUwIvDOsVU/iSOyx9pcfPrmiFnQskbT2d8="; }; propagatedBuildInputs = [ qtbase ]; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index 5c9a0e58a82c..ba24fbe9294b 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -22,18 +22,32 @@ , libunwind , orc , VideoToolbox +, pkgsBuildBuild }: qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libunwind orc ffmpeg_6 ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ]; - propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools qtquick3d ] + buildInputs = [ ffmpeg_6 ] + ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ libunwind orc ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio alsa-lib wayland libXrandr libva ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils ]; + propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools ] + ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ qtquick3d ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; - cmakeFlags = [ "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" ]; + patches = [ + ../patches/fix-qtgui-include-incorrect-case.patch + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + ../patches/qtmultimedia-windows-no-uppercase-libs.patch + ../patches/qtmultimedia-windows-resolve-function-name.patch + ]; + + cmakeFlags = [ + "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" + "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderToolsTools" + ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-include AudioToolbox/AudioToolbox.h"; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index f07aeefa0be0..e6f785cd833c 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -122,9 +122,6 @@ qtModule { hardeningDisable = [ "format" ]; patches = [ - # removes macOS 12+ dependencies - ../patches/qtwebengine-darwin-no-low-latency-flag.patch - ../patches/qtwebengine-darwin-no-copy-certificate-chain.patch # Don't assume /usr/share/X11, and also respect the XKB_CONFIG_ROOT # environment variable, since NixOS relies on it working. # See https://github.com/NixOS/nixpkgs/issues/226484 for more context. diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch index de35178f7929..a8bb8f71cdbf 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch @@ -1,8 +1,8 @@ -From 90734859d2f9e6b9a1754c3e694ceb1a3c870bce Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Thu, 13 Apr 2023 23:42:29 +0800 -Subject: [PATCH 01/11] qtbase: qmake: always use libname instead of absolute - path in qmake files +Subject: [PATCH] qtbase: qmake: always use libname instead of absolute path in + qmake files In generated qmake files, absolute paths to qt libraries are embedded and then used in linker flags. However as the libraries can be provided @@ -45,6 +45,3 @@ index 3ffe354fd8d..441332d4582 100644 list(APPEND out_list "${lib_name_with_link_flag}") else() list(APPEND out_list "${library_path}") --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch index a204d52c9f0c..9afcc8240ab3 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-default-disable-qmlcache.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0001-qtdeclarative-disable-qml-disk-cache.patch @@ -1,4 +1,4 @@ -From 2d561e0a80f2d123a7348187975ee845f9dcd9e0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 11:12:27 -0400 Subject: [PATCH] qtdeclarative: disable qml disk cache @@ -8,10 +8,10 @@ Subject: [PATCH] qtdeclarative: disable qml disk cache 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp -index d1b4c4fff6..50f8a07420 100644 +index 506b920142..3cadb4fe06 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp -@@ -2232,11 +2232,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const +@@ -2202,11 +2202,7 @@ ExecutionEngine::DiskCacheOptions ExecutionEngine::diskCacheOptions() const { if (forceDiskCache()) return DiskCache::Enabled; @@ -24,6 +24,3 @@ index d1b4c4fff6..50f8a07420 100644 } void ExecutionEngine::callInContext(QV4::Function *function, QObject *self, --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index 6cdbec5abfc7..1e548950a2a6 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -1,19 +1,19 @@ -From a804a9b1efdab0a71b9947e5c2bf9f6f5e316e0e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Fri, 14 Apr 2023 21:43:04 +0800 -Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin +Subject: [PATCH] qtbase: qmake: fix mkspecs for darwin --- mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 263 -------------------------- + 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(+), 415 deletions(-) + 6 files changed, 1 insertion(+), 416 deletions(-) diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 +index 61bea952b22..9909dae7260 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -26,7 +26,7 @@ index 61bea952b2..9909dae726 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index 0b64a586b9..3b40328304 100644 +index 0b64a586b93..3b40328304d 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,5 @@ @@ -311,7 +311,7 @@ index 0b64a586b9..3b40328304 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 e3534561a5..3b01424e67 100644 +index e3534561a56..3b01424e67b 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ @@ -376,7 +376,7 @@ index e3534561a5..3b01424e67 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 a32ceacb6c..e69de29bb2 100644 +index a32ceacb6ce..e69de29bb2d 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,27 +0,0 @@ @@ -408,7 +408,7 @@ index a32ceacb6c..e69de29bb2 100644 - endif -endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bb..e69de29bb2 100644 +index 3a9c2778bbe..e69de29bb2d 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -1,61 +0,0 @@ @@ -474,7 +474,7 @@ index 3a9c2778bb..e69de29bb2 100644 - cache($$tool_variable, set stash, $$tool) -} diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c..e69de29bb2 100644 +index df191eb13c4..e69de29bb2d 100644 --- a/mkspecs/features/mac/toolchain.prf +++ b/mkspecs/features/mac/toolchain.prf @@ -1,5 +0,0 @@ diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch index 39b7a30892cf..d857d7ac1bba 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtdeclarative-qml-paths.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0002-qtdeclarative-also-use-versioned-qml-paths.patch @@ -1,8 +1,17 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Wed, 7 Feb 2024 11:49:04 -0500 +Subject: [PATCH] qtdeclarative: also use versioned qml paths + +--- + src/qml/qml/qqmlimport.cpp | 1 + + 1 file changed, 1 insertion(+) + diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index 2e482c220d..4873809bec 100644 +index f9cc8da240..f8cb033be0 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp -@@ -1517,6 +1517,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) +@@ -1520,6 +1520,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) // env import paths addEnvImportPath("QML_IMPORT_PATH"); addEnvImportPath("QML2_IMPORT_PATH"); diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch index 53f226254a19..f2f9425841a8 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0003-qtbase-qmake-fix-includedir-in-generated-pkg-config.patch @@ -1,14 +1,14 @@ -From 6088085d3074316dd74639fc6c1233e5862aff11 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Fri, 14 Apr 2023 09:34:46 +0800 -Subject: [PATCH 03/11] qtbase: qmake: fix includedir in generated pkg-config +Subject: [PATCH] qtbase: qmake: fix includedir in generated pkg-config --- qmake/generators/makefile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 11d2f0ff7df..c78ed0d3485 100644 +index 482ef2e2697..49217e62cda 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3412,8 +3412,7 @@ MakefileGenerator::writePkgConfigFile() @@ -21,6 +21,3 @@ index 11d2f0ff7df..c78ed0d3485 100644 if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle") && libDir != QLatin1String("/Library/Frameworks")) { t << " -F${libdir}"; --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch deleted file mode 100644 index ccd0fb02fcd8..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-deal-with-a-font-face-at-index-0-as-Regular-f.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 82e243f326aea40e7f3da935d8166979b11e8063 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Tue, 21 Mar 2023 15:48:49 +0800 -Subject: [PATCH 04/11] qtbase: deal with a font face at index 0 as Regular for - Variable fonts - -Reference: https://bugreports.qt.io/browse/QTBUG-111994 ---- - src/gui/text/unix/qfontconfigdatabase.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp -index 474644b871f..c7a117fd134 100644 ---- a/src/gui/text/unix/qfontconfigdatabase.cpp -+++ b/src/gui/text/unix/qfontconfigdatabase.cpp -@@ -556,6 +556,7 @@ void QFontconfigDatabase::populateFontDatabase() - FcObjectSetAdd(os, *p); - ++p; - } -+ FcPatternAddBool(pattern, FC_VARIABLE, FcFalse); - fonts = FcFontList(nullptr, pattern, os); - FcObjectSetDestroy(os); - FcPatternDestroy(pattern); --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch new file mode 100644 index 000000000000..56d19e0bb817 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0004-qtbase-qt-cmake-always-use-cmake-from-path.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nick Cao <nickcao@nichi.co> +Date: Wed, 12 Apr 2023 10:13:50 +0800 +Subject: [PATCH] qtbase: qt-cmake: always use cmake from path + +The generated qt-cmake scripts embeds the absolute path of cmake used +during the build of qtbase, bloating the runtime closure of qtbase. +--- + bin/qt-cmake-create.in | 7 +------ + bin/qt-cmake.in | 7 +------ + 2 files changed, 2 insertions(+), 12 deletions(-) + +diff --git a/bin/qt-cmake-create.in b/bin/qt-cmake-create.in +index 7865d0fe91b..884dc4aba93 100755 +--- a/bin/qt-cmake-create.in ++++ b/bin/qt-cmake-create.in +@@ -7,12 +7,7 @@ HELP_MESSAGE="Usage + script_dir_path=`dirname $0` + script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` + +-# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. +-original_cmake_path="@CMAKE_COMMAND@" +-cmake_path=$original_cmake_path +-if ! test -f "$cmake_path"; then +- cmake_path="cmake" +-fi ++cmake_path="cmake" + + if [ "$#" -gt 1 ]; then + echo "Invalid number of arguments" +diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in +index f719257f602..571ffe788fa 100755 +--- a/bin/qt-cmake.in ++++ b/bin/qt-cmake.in +@@ -4,12 +4,7 @@ + script_dir_path=`dirname $0` + script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` + +-# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. +-original_cmake_path="@CMAKE_COMMAND@" +-cmake_path=$original_cmake_path +-if ! test -f "$cmake_path"; then +- cmake_path="cmake" +-fi ++cmake_path="cmake" + + toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake" + diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch index 1d60684e0700..df1b67654b61 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-find-tools-in-PATH.patch @@ -1,7 +1,7 @@ -From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: rewine <luhongxu@deepin.org> Date: Wed, 29 Mar 2023 11:51:33 +0800 -Subject: [PATCH 06/11] qtbase-find-tools-in-PATH +Subject: [PATCH] qtbase: find tools in PATH 1. find qt's tools in `QTTOOLSPATH` env qt assumes that all components use the same install prefix @@ -19,10 +19,10 @@ Subject: [PATCH 06/11] qtbase-find-tools-in-PATH 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake -index 48ed5a324bf..91d8d41fb1f 100644 +index 8b631e88ca5..922639a9985 100644 --- a/cmake/QtDocsHelpers.cmake +++ b/cmake/QtDocsHelpers.cmake -@@ -47,9 +47,14 @@ function(qt_internal_add_docs) +@@ -72,9 +72,14 @@ function(qt_internal_add_docs) set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}") endif() @@ -40,6 +40,3 @@ index 48ed5a324bf..91d8d41fb1f 100644 get_target_property(target_type ${target} TYPE) if (NOT target_type STREQUAL "INTERFACE_LIBRARY") --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch deleted file mode 100644 index ad30ebc71413..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0005-qtbase-qt-cmake-always-use-cmake-from-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b480022b364b262d5ff63738c02318da925f5c79 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Wed, 12 Apr 2023 10:13:50 +0800 -Subject: [PATCH 05/11] qtbase: qt-cmake: always use cmake from path - -The generated qt-cmake scripts embeds the absolute path of cmake used -during the build of qtbase, bloating the runtime closure of qtbase. ---- - bin/qt-cmake.in | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in -index f719257f602..571ffe788fa 100755 ---- a/bin/qt-cmake.in -+++ b/bin/qt-cmake.in -@@ -4,12 +4,7 @@ - script_dir_path=`dirname $0` - script_dir_path=`(cd "$script_dir_path"; /bin/pwd)` - --# Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH. --original_cmake_path="@CMAKE_COMMAND@" --cmake_path=$original_cmake_path --if ! test -f "$cmake_path"; then -- cmake_path="cmake" --fi -+cmake_path="cmake" - - toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@/qt.toolchain.cmake" - --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch index 7bf2193bc208..de4c12ef0448 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0006-qtbase-pass-to-qmlimportscanner-the-QML2_IMPORT_PATH.patch @@ -1,17 +1,17 @@ -From d7a9a3b0ecdbb1b5829f25954d763d767f1c8794 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 10:12:56 -0400 -Subject: [PATCH 07/11] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH +Subject: [PATCH] qtbase: pass to qmlimportscanner the QML2_IMPORT_PATH --- src/tools/macdeployqt/shared/shared.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 2ae4f998944..ba10ae02bcd 100644 +index b7ee93f6fc1..57b68627eba 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1297,6 +1297,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1300,6 +1300,13 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf argumentList.append( "-importPath"); argumentList.append(qmlImportsPath); @@ -25,6 +25,3 @@ index 2ae4f998944..ba10ae02bcd 100644 // run qmlimportscanner QProcess qmlImportScanner; qmlImportScanner.start(qmlImportScannerPath, argumentList); --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch index 07f1973d7607..d8061f1610e9 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0007-qtbase-allow-translations-outside-prefix.patch @@ -1,14 +1,14 @@ -From 79da6bb6ff075e8cf972be8a462630f1ec86bf0a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 10:14:40 -0400 -Subject: [PATCH 08/11] qtbase: allow translations outside prefix +Subject: [PATCH] qtbase: allow translations outside prefix --- - cmake/QtBuild.cmake | 2 +- + cmake/QtBuildPathsHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake -index edc43f2f14..78fa219515 100644 +index 18082ac6a5f..e16aea7d7c6 100644 --- a/cmake/QtBuildPathsHelpers.cmake +++ b/cmake/QtBuildPathsHelpers.cmake @@ -134,7 +134,7 @@ function(qt_configure_process_path name default docstring) diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch index fb17a539f053..597dd7e6550d 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch @@ -1,8 +1,7 @@ -From d503be89320f0b89b80acb19769971e855be6ae1 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pedro=20Bol=C3=ADvar=20Puente?= <raskolnikov@gnu.org> Date: Wed, 9 Aug 2023 16:16:21 +0200 -Subject: [PATCH 09/11] qtbase: find qmlimportscanner in macdeployqt via - environment +Subject: [PATCH] qtbase: find qmlimportscanner in macdeployqt via environment The qmlimportscanner tool is provided by qtdeclarative. Because of the modularized installation in Nix, it can not be found via the usual @@ -17,10 +16,10 @@ a workaround for users. 1 file changed, 4 insertions(+) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index ba10ae02bcd..320095a972d 100644 +index 57b68627eba..2b972a76c49 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1277,6 +1277,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1280,6 +1280,10 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf if (!QFile::exists(qmlImportScannerPath)) qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner"; @@ -31,6 +30,3 @@ index ba10ae02bcd..320095a972d 100644 // Verify that we found a qmlimportscanner binary if (!QFile::exists(qmlImportScannerPath)) { LogError() << "qmlimportscanner not found at" << qmlImportScannerPath; --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch index ed749cb238a5..890c68a97f77 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0009-qtbase-check-in-the-QML-folder-of-this-library-does-.patch @@ -1,8 +1,8 @@ -From c00e310092d9aeb48adf21dd22f1ee4dbdbf5ebb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nick Cao <nickcao@nichi.co> Date: Tue, 10 Oct 2023 10:17:00 -0400 -Subject: [PATCH 10/11] qtbase: check in the QML folder of this library does - actually exist +Subject: [PATCH] qtbase: check in the QML folder of this library does actually + exist In a modularized installation, this folder will be the location where `qtbase` itself is installed, but `qtbase` does not have any QML @@ -12,10 +12,10 @@ code, and `qmlimportscanner` will complain that it does not exist. 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tools/macdeployqt/shared/shared.cpp b/src/tools/macdeployqt/shared/shared.cpp -index 320095a972d..87ba0d4e24b 100644 +index 2b972a76c49..96c61b3824a 100644 --- a/src/tools/macdeployqt/shared/shared.cpp +++ b/src/tools/macdeployqt/shared/shared.cpp -@@ -1297,9 +1297,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf +@@ -1300,9 +1300,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf } for (const QString &importPath : qmlImportPaths) argumentList << "-importPath" << importPath; @@ -30,6 +30,3 @@ index 320095a972d..87ba0d4e24b 100644 // In a modularized installation of qt as we have in Nix, instead, we will // read the paths from the environment, as they are spread in multiple --- -2.42.0 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch index cae39e879120..b950b7d4ac79 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/0010-qtbase-derive-plugin-load-path-from-PATH.patch @@ -1,17 +1,17 @@ -From 6f0e6fe1e13ca5844a93d3b97111b7ece7e60f0f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> Date: Sun, 10 May 2020 12:47:28 +0200 -Subject: [PATCH 11/11] qtbase: derive plugin load path from PATH +Subject: [PATCH] qtbase: derive plugin load path from PATH --- src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index a80efbb5622..0d41dabeed3 100644 +index 1ce2642cf2d..48fd91a0d7f 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -3032,6 +3032,15 @@ QStringList QCoreApplication::libraryPathsLocked() +@@ -3038,6 +3038,15 @@ QStringList QCoreApplication::libraryPathsLocked() app_libpaths->append(installPathPlugins); } @@ -27,6 +27,3 @@ index a80efbb5622..0d41dabeed3 100644 // If QCoreApplication is not yet instantiated, // make sure we add the application path when we construct the QCoreApplication if (self) self->d_func()->appendApplicationPathToLibraryPaths(); --- -2.43.1 - diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch new file mode 100644 index 000000000000..563906fb3157 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/fix-qtgui-include-incorrect-case.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +index affa52d..b71b461 100644 +--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp ++++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +@@ -7,7 +7,7 @@ + #include <private/qabstractvideobuffer_p.h> + #include <private/qmultimediautils_p.h> + #include <private/qwindowsmultimediautils_p.h> +-#include <qtgui/qscreen_platform.h> ++#include <QtGui/qscreen_platform.h> + #include "qvideoframe.h" + + #include <qloggingcategory.h> diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-no-uppercase-libs.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-no-uppercase-libs.patch new file mode 100644 index 000000000000..05f009bacdad --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-no-uppercase-libs.patch @@ -0,0 +1,13 @@ +diff --git a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +index c0fbb53..3c82085 100644 +--- a/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp ++++ b/src/plugins/multimedia/ffmpeg/qffmpegscreencapture_dxgi.cpp +@@ -14,7 +14,7 @@ + #include <qwaitcondition.h> + #include <qmutex.h> + +-#include "D3d11.h" ++#include "d3d11.h" + #include "dxgi1_2.h" + + #include <system_error> diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-resolve-function-name.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-resolve-function-name.patch new file mode 100644 index 000000000000..681e36e0c513 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtmultimedia-windows-resolve-function-name.patch @@ -0,0 +1,30 @@ +diff --git a/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp b/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp +index aac77ae..71ffed6 100644 +--- a/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp ++++ b/src/plugins/multimedia/ffmpeg/qwincapturablewindows.cpp +@@ -42,11 +42,7 @@ static QString windowTitle(HWND hwnd) { + return QString::fromStdWString(buffer); + } + +-QList<QCapturableWindow> QWinCapturableWindows::windows() const +-{ +- QList<QCapturableWindow> result; +- +- auto windowHandler = [](HWND hwnd, LPARAM lParam) { ++static int __stdcall windowHandler(HWND hwnd, LPARAM lParam) { + if (!canCaptureWindow(hwnd)) + return TRUE; // Ignore window and continue enumerating + +@@ -58,7 +54,11 @@ QList<QCapturableWindow> QWinCapturableWindows::windows() const + windows.push_back(windowData.release()->create()); + + return TRUE; +- }; ++} ++ ++QList<QCapturableWindow> QWinCapturableWindows::windows() const ++{ ++ QList<QCapturableWindow> result; + + ::EnumWindows(windowHandler, reinterpret_cast<LPARAM>(&result)); + diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch deleted file mode 100644 index c7e461945c04..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-copy-certificate-chain.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/3rdparty/chromium/net/cert/x509_util_apple.cc b/src/3rdparty/chromium/net/cert/x509_util_apple.cc -index ae69948dfca..7062a9a9b97 100644 ---- a/src/3rdparty/chromium/net/cert/x509_util_apple.cc -+++ b/src/3rdparty/chromium/net/cert/x509_util_apple.cc -@@ -139,11 +139,6 @@ SHA256HashValue CalculateFingerprint256(SecCertificateRef cert) { - - base::ScopedCFTypeRef<CFArrayRef> CertificateChainFromSecTrust( - SecTrustRef trust) { -- if (__builtin_available(macOS 12.0, iOS 15.0, *)) { -- return base::ScopedCFTypeRef<CFArrayRef>( -- SecTrustCopyCertificateChain(trust)); -- } -- - base::ScopedCFTypeRef<CFMutableArrayRef> chain( - CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks)); - const CFIndex chain_length = SecTrustGetCertificateCount(trust); diff --git a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch b/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch deleted file mode 100644 index 3df917edf5cc..000000000000 --- a/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-darwin-no-low-latency-flag.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -index d4b0161b2e..e5a0eb1967 100644 ---- a/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -+++ b/src/3rdparty/chromium/media/gpu/mac/vt_video_encode_accelerator_mac.cc -@@ -29,12 +29,6 @@ - #include "media/base/video_types.h" - #include "media/video/video_encode_accelerator.h" - --// This is a min version of macOS where we want to support SVC encoding via --// EnableLowLatencyRateControl flag. The flag is actually supported since 11.3, --// but there we see frame drops even with ample bitrate budget. Excessive frame --// drops were fixed in 12.0.1. --#define LOW_LATENCY_FLAG_AVAILABLE_VER 12.0.1 -- - namespace media { - - namespace { -@@ -277,8 +271,6 @@ VTVideoEncodeAccelerator::GetSupportedH264Profiles() { - profile.rate_control_modes = VideoEncodeAccelerator::kConstantMode | - VideoEncodeAccelerator::kVariableMode; - profile.scalability_modes.push_back(SVCScalabilityMode::kL1T1); -- if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) -- profile.scalability_modes.push_back(SVCScalabilityMode::kL1T2); - - for (const auto& supported_profile : kSupportedProfiles) { - if (VideoCodecProfileToVideoCodec(supported_profile) == VideoCodec::kH264) { -@@ -814,14 +806,6 @@ bool VTVideoEncodeAccelerator::CreateCompressionSession( - encoder_values.push_back(kCFBooleanFalse); - } - -- if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { -- // Remove the validation once HEVC SVC mode is supported on macOS. -- if (require_low_delay_ && codec == VideoCodec::kH264) { -- encoder_keys.push_back( -- kVTVideoEncoderSpecification_EnableLowLatencyRateControl); -- encoder_values.push_back(kCFBooleanTrue); -- } -- } - base::ScopedCFTypeRef<CFDictionaryRef> encoder_spec = - video_toolbox::DictionaryWithKeysAndValues( - encoder_keys.data(), encoder_values.data(), encoder_keys.size()); -@@ -891,19 +875,8 @@ bool VTVideoEncodeAccelerator::ConfigureCompressionSession(VideoCodec codec) { - - // Remove the validation once HEVC SVC mode is supported on macOS. - if (num_temporal_layers_ == 2 && codec_ == VideoCodec::kH264) { -- if (__builtin_available(macOS LOW_LATENCY_FLAG_AVAILABLE_VER, *)) { -- if (!session_property_setter.IsSupported( -- kVTCompressionPropertyKey_BaseLayerFrameRateFraction)) { -- DLOG(ERROR) << "BaseLayerFrameRateFraction is not supported"; -- return false; -- } -- rv &= session_property_setter.Set( -- kVTCompressionPropertyKey_BaseLayerFrameRateFraction, 0.5); -- DLOG_IF(ERROR, !rv) << " Setting BaseLayerFrameRate property failed."; -- } else { - DLOG(ERROR) << "SVC encoding is not supported on this OS version."; - rv = false; -- } - } - - return rv; diff --git a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix index 5edd42d3004e..767755fcbd87 100644 --- a/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/qt-6/srcs.nix @@ -4,315 +4,315 @@ { qt3d = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qt3d-everywhere-src-6.6.3.tar.xz"; - sha256 = "0v6zprw9r4z4inj7mg364n959c6japklm7ji2952nm3i01zp8jd5"; - name = "qt3d-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qt3d-everywhere-src-6.7.0.tar.xz"; + sha256 = "0934i5b90hyxk8s58ji7mc062wdsxlvb45y79ygvfcl6psl84fw0"; + name = "qt3d-everywhere-src-6.7.0.tar.xz"; }; }; qt5compat = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qt5compat-everywhere-src-6.6.3.tar.xz"; - sha256 = "02zcrrh6rq5p6bqix5nk2h22rfqdrf4d0h7y4rva5zmbbr7czhk8"; - name = "qt5compat-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz"; + sha256 = "1x8r9rjkyxhn2fzhj53z7biqd0hxkka5rdp0cc5s9n25hgyx8jcx"; + name = "qt5compat-everywhere-src-6.7.0.tar.xz"; }; }; qtactiveqt = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtactiveqt-everywhere-src-6.6.3.tar.xz"; - sha256 = "0balhrmzmjrqn6h2r3rr00776vxhdpqzwhk9knrlvix8i1kr86x1"; - name = "qtactiveqt-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtactiveqt-everywhere-src-6.7.0.tar.xz"; + sha256 = "1cyh6h4829pjsklks1agym6gzz7pz2hbydvfqd190izv2fi8a125"; + name = "qtactiveqt-everywhere-src-6.7.0.tar.xz"; }; }; qtbase = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtbase-everywhere-src-6.6.3.tar.xz"; - sha256 = "0qklvzg242ilxw29jd2vsz6s8ni4dpraf4ghfa4dykhc705zv4q4"; - name = "qtbase-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz"; + sha256 = "0m5jp0rh5965d242s68wdvrxy3x1a6z3p89y8lxhxysj5sgf5chi"; + name = "qtbase-everywhere-src-6.7.0.tar.xz"; }; }; qtcharts = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtcharts-everywhere-src-6.6.3.tar.xz"; - sha256 = "1rbz2nm8wrdf060cssvs69b5kqv0ybxjqw1clm5mdllg2j38i5jh"; - name = "qtcharts-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtcharts-everywhere-src-6.7.0.tar.xz"; + sha256 = "193w5grxndh0gfnyfipn7jdlskfz5b43h97zwbyh3yqvr6c597c9"; + name = "qtcharts-everywhere-src-6.7.0.tar.xz"; }; }; qtconnectivity = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtconnectivity-everywhere-src-6.6.3.tar.xz"; - sha256 = "066mf4d6a81ywviwr8bvm1mpm2ykjzysvcc0v2x82h5bl28vl6h9"; - name = "qtconnectivity-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtconnectivity-everywhere-src-6.7.0.tar.xz"; + sha256 = "0k14f7fqhychxj9j6xwad9yp7wjf7ps5f427l65krxwzq6mddbq7"; + name = "qtconnectivity-everywhere-src-6.7.0.tar.xz"; }; }; qtdatavis3d = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdatavis3d-everywhere-src-6.6.3.tar.xz"; - sha256 = "1gyz83hkmjin3fr3brg00qchbb0awprwx99idysrc6chckj825wv"; - name = "qtdatavis3d-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdatavis3d-everywhere-src-6.7.0.tar.xz"; + sha256 = "1a8v150bva3v9njhma7424jbczjb76l7pgzw61b0qyck326j94ss"; + name = "qtdatavis3d-everywhere-src-6.7.0.tar.xz"; }; }; qtdeclarative = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdeclarative-everywhere-src-6.6.3.tar.xz"; - sha256 = "1wwjlwjb3hnlpai4rrrdsm096a6ahb1izs3524r79jpjzhn7n805"; - name = "qtdeclarative-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz"; + sha256 = "0b4yz9c4lba9p5xgzaymz3a8fwl8s1p8cb0nh6jwrmvlk9bkj32s"; + name = "qtdeclarative-everywhere-src-6.7.0.tar.xz"; }; }; qtdoc = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtdoc-everywhere-src-6.6.3.tar.xz"; - sha256 = "1j7awdbg7c0slbyhld8cdbx4dic7hhqv3g1qka809bjcxa2hb188"; - name = "qtdoc-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtdoc-everywhere-src-6.7.0.tar.xz"; + sha256 = "0h4w06rc8xz31iy5g8cmxs9d0p9pd6nxlyjp2k6bbr2dq085w7lr"; + name = "qtdoc-everywhere-src-6.7.0.tar.xz"; }; }; qtgraphs = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtgraphs-everywhere-src-6.6.3.tar.xz"; - sha256 = "1ppdas6bl22z69w8wdy7xl0f1kyqja2gwjd4cn6kjmsslws5rhi2"; - name = "qtgraphs-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtgraphs-everywhere-src-6.7.0.tar.xz"; + sha256 = "15clif3warl4hbgdjbpnpfgy4mi2y8hkj5sc4afhzbv2gsbd2dab"; + name = "qtgraphs-everywhere-src-6.7.0.tar.xz"; }; }; qtgrpc = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtgrpc-everywhere-src-6.6.3.tar.xz"; - sha256 = "11q9cqqk8bs3k6n5pxys2r4fisbs3xvv8d8lsi7wm25rqh5qv1kj"; - name = "qtgrpc-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtgrpc-everywhere-src-6.7.0.tar.xz"; + sha256 = "18gsi9sb4v4q2g0ccmf6nkj37vzixaaha3mk882p3qys250b26dp"; + name = "qtgrpc-everywhere-src-6.7.0.tar.xz"; }; }; qthttpserver = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qthttpserver-everywhere-src-6.6.3.tar.xz"; - sha256 = "0dbqx36ywfmqi4nxfi4dl17scj9nkl8sbpb670ffy3nh8pbpib21"; - name = "qthttpserver-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qthttpserver-everywhere-src-6.7.0.tar.xz"; + sha256 = "1ylvz3cny3g68lqdcy2bqii1820nyaspn28dybp7wlr15f5y7qn2"; + name = "qthttpserver-everywhere-src-6.7.0.tar.xz"; }; }; qtimageformats = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtimageformats-everywhere-src-6.6.3.tar.xz"; - sha256 = "0z328i6fix1qdklfbs1w4dsr64zavjj5kzqvzipww0v62xhfm99w"; - name = "qtimageformats-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtimageformats-everywhere-src-6.7.0.tar.xz"; + sha256 = "19r9q233pwiqqf57khdv1qfnjkqxnzfk7zhnk32i2nnxr1zf0v2i"; + name = "qtimageformats-everywhere-src-6.7.0.tar.xz"; }; }; qtlanguageserver = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlanguageserver-everywhere-src-6.6.3.tar.xz"; - sha256 = "136gyvkzm6skdv5yhyy4nqhbczfc2mn4nbr9hvpkpljb0awv888h"; - name = "qtlanguageserver-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlanguageserver-everywhere-src-6.7.0.tar.xz"; + sha256 = "1z69fqgqbbipwfhlabs0z6axx4br1a1qjk404jnbgxxx58scp7m9"; + name = "qtlanguageserver-everywhere-src-6.7.0.tar.xz"; }; }; qtlocation = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlocation-everywhere-src-6.6.3.tar.xz"; - sha256 = "1l81z3zq1zg015l6qxx4yzssdspw689m9bpzxp23yshaych2kd6p"; - name = "qtlocation-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlocation-everywhere-src-6.7.0.tar.xz"; + sha256 = "0snl7a8fax0771hqaa0g653f0428x7c546zc4vsrinqppik4s15v"; + name = "qtlocation-everywhere-src-6.7.0.tar.xz"; }; }; qtlottie = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtlottie-everywhere-src-6.6.3.tar.xz"; - sha256 = "1d0fjb0080wnd71f50zwal1b504iimln9mpnb3sc5yznmv8gm4cq"; - name = "qtlottie-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtlottie-everywhere-src-6.7.0.tar.xz"; + sha256 = "1vd27g93kjala7849ny3n4nw0xg2j7ba2i682fyhdq4r7kggn3ww"; + name = "qtlottie-everywhere-src-6.7.0.tar.xz"; }; }; qtmultimedia = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtmultimedia-everywhere-src-6.6.3.tar.xz"; - sha256 = "1ciswpv8p71j9hwwdhfr5pmsrnizlaijp0dnyc99lk5is8qgh05y"; - name = "qtmultimedia-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtmultimedia-everywhere-src-6.7.0.tar.xz"; + sha256 = "0w4c0yyzgfhm6vd4qkxllh2cqw5q3giybqf9n2iyckixkvjbm57k"; + name = "qtmultimedia-everywhere-src-6.7.0.tar.xz"; }; }; qtnetworkauth = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtnetworkauth-everywhere-src-6.6.3.tar.xz"; - sha256 = "153mpg4hv3nclcdrkbzkalg4xf5k6r64fj003b725zyp885s7fax"; - name = "qtnetworkauth-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtnetworkauth-everywhere-src-6.7.0.tar.xz"; + sha256 = "0iaalz7kpbjzjcrf5nmcw7322mq381s4jakfh8yks8phdxhhaccr"; + name = "qtnetworkauth-everywhere-src-6.7.0.tar.xz"; }; }; qtpositioning = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtpositioning-everywhere-src-6.6.3.tar.xz"; - sha256 = "1frzzndsscb6iqschklks2l17ppnjpnx1lq1cypnq3x0598bcdws"; - name = "qtpositioning-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtpositioning-everywhere-src-6.7.0.tar.xz"; + sha256 = "1pwxc2fhwvmq0mwrv9fak3d1bh23b7maxshyp0fs1j167jj1nq0x"; + name = "qtpositioning-everywhere-src-6.7.0.tar.xz"; }; }; qtquick3d = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquick3d-everywhere-src-6.6.3.tar.xz"; - sha256 = "1qls5cydhm7p1g3gqzvnism8k0h6wjzi8x12gn51dapvnzq2cxlr"; - name = "qtquick3d-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquick3d-everywhere-src-6.7.0.tar.xz"; + sha256 = "046rgvvf4a37b0anqn1h814231ibw8kxk4yd9yvk7ab57yzl7fcb"; + name = "qtquick3d-everywhere-src-6.7.0.tar.xz"; }; }; qtquick3dphysics = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquick3dphysics-everywhere-src-6.6.3.tar.xz"; - sha256 = "0ipma4qdmzyyajs5inp7d3znh2hfx42gia7x9ahqpb515r49pqb7"; - name = "qtquick3dphysics-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquick3dphysics-everywhere-src-6.7.0.tar.xz"; + sha256 = "1rh41sadi5l2yypskhwrcjii0llkdq2msh0bgj0g7wq924k5y140"; + name = "qtquick3dphysics-everywhere-src-6.7.0.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquickeffectmaker-everywhere-src-6.6.3.tar.xz"; - sha256 = "0mr350c9kj74g48lavq5z5c604cdgcyycfdpwv5z8bmbr49jl95w"; - name = "qtquickeffectmaker-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquickeffectmaker-everywhere-src-6.7.0.tar.xz"; + sha256 = "1m84pjw4d2gvypgajz21xcl9di1vmswqwb0nd763bjk181kfq3rx"; + name = "qtquickeffectmaker-everywhere-src-6.7.0.tar.xz"; }; }; qtquicktimeline = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtquicktimeline-everywhere-src-6.6.3.tar.xz"; - sha256 = "0b266w7al90fbbp16w506klba50d4izf6nfcmmp5fpr6h5pxvcyk"; - name = "qtquicktimeline-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtquicktimeline-everywhere-src-6.7.0.tar.xz"; + sha256 = "1gc96jva2nm7a3zv5zwmhrvifjlngngddm3kaivmfpbbdiy6aigb"; + name = "qtquicktimeline-everywhere-src-6.7.0.tar.xz"; }; }; qtremoteobjects = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtremoteobjects-everywhere-src-6.6.3.tar.xz"; - sha256 = "16bd4zd3yfzlzk087qphphsh8hv38q3a57n1yknvkc5fchzmfzjz"; - name = "qtremoteobjects-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtremoteobjects-everywhere-src-6.7.0.tar.xz"; + sha256 = "15f6wjszl5mxjrjd8r36l3x3p1nzhgib33bb7743ywf94pb61fm0"; + name = "qtremoteobjects-everywhere-src-6.7.0.tar.xz"; }; }; qtscxml = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtscxml-everywhere-src-6.6.3.tar.xz"; - sha256 = "1dbcw4qnss5rif97gdcimyzl3jqa508yph611dvvhc1xn16nl6qg"; - name = "qtscxml-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtscxml-everywhere-src-6.7.0.tar.xz"; + sha256 = "0z15m5l44asp4masjxmkxqcc4x93v6n8i12qswrzfvbnp2xrfnvj"; + name = "qtscxml-everywhere-src-6.7.0.tar.xz"; }; }; qtsensors = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtsensors-everywhere-src-6.6.3.tar.xz"; - sha256 = "0r9p3lm159pji29vq9kii42jkz4rg15hqh6zlq9442i58a0ayddj"; - name = "qtsensors-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtsensors-everywhere-src-6.7.0.tar.xz"; + sha256 = "1axwywwgygcri1pfjyaiqa7hd7kivya0gr0q11v4z9ih18h1ac0w"; + name = "qtsensors-everywhere-src-6.7.0.tar.xz"; }; }; qtserialbus = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtserialbus-everywhere-src-6.6.3.tar.xz"; - sha256 = "1yyh1bh5pjlilcq84fgfw6wd0jak55wndwf0sn92lbhsp3y5lghl"; - name = "qtserialbus-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtserialbus-everywhere-src-6.7.0.tar.xz"; + sha256 = "1pbnpfazgpaqzi1sz141sh9sqygibb25crk7byjzhr06hslr70a9"; + name = "qtserialbus-everywhere-src-6.7.0.tar.xz"; }; }; qtserialport = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtserialport-everywhere-src-6.6.3.tar.xz"; - sha256 = "0dywalgafvxi2jgdv9dk22hwwd8qsgk5xfybh75n3njmwmwnarg1"; - name = "qtserialport-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtserialport-everywhere-src-6.7.0.tar.xz"; + sha256 = "1jc1g46pgjy39vyk7inzx0kx6iziy54kgjkwz8pvmj4wihyjmw5i"; + name = "qtserialport-everywhere-src-6.7.0.tar.xz"; }; }; qtshadertools = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtshadertools-everywhere-src-6.6.3.tar.xz"; - sha256 = "1rm17hyhq244zskq3ar3h22qjd5dshy84nnyq1ivhg5k7gb0j2cc"; - name = "qtshadertools-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz"; + sha256 = "1bwqg5gn2nfm61950yhcv9q93qd2fb2cnm77074ia21gqrkzj4ry"; + name = "qtshadertools-everywhere-src-6.7.0.tar.xz"; }; }; qtspeech = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtspeech-everywhere-src-6.6.3.tar.xz"; - sha256 = "1yh3r5zbhgwkjgs7yk6iv2w23766n1i4z8vjkkw5awdixx3gfa76"; - name = "qtspeech-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtspeech-everywhere-src-6.7.0.tar.xz"; + sha256 = "048z7lqvpqi4073lx7s83d9kqbfg59banapi7qiw4j3xhfx8wxj4"; + name = "qtspeech-everywhere-src-6.7.0.tar.xz"; }; }; qtsvg = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtsvg-everywhere-src-6.6.3.tar.xz"; - sha256 = "1ir57bis27whq7bwqykk1qlxy0522k4ia39brxayjmfadrbixjsa"; - name = "qtsvg-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz"; + sha256 = "0bcjpwzggrqp2gf9a1xp8g0klh9kn2amnvp2lr9n2ppz107g860m"; + name = "qtsvg-everywhere-src-6.7.0.tar.xz"; }; }; qttools = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qttools-everywhere-src-6.6.3.tar.xz"; - sha256 = "1h0vz46mpvzbm5w6sgpk0b3mqkn278l45arhxxk41dwc5n14qvda"; - name = "qttools-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qttools-everywhere-src-6.7.0.tar.xz"; + sha256 = "0yzfmfqwn0y534z47yyk71236nnsq0v0kgsw8qiixzl2kqinpnn8"; + name = "qttools-everywhere-src-6.7.0.tar.xz"; }; }; qttranslations = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qttranslations-everywhere-src-6.6.3.tar.xz"; - sha256 = "1kvkrwbgby4i69dpxbxxcv0qbsz69n6icpyr4wcf8qm2r4m5zqqj"; - name = "qttranslations-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qttranslations-everywhere-src-6.7.0.tar.xz"; + sha256 = "0mjbx9n8fh4xp9r0r4p9ynjy1iirzn3bwlyr3g6vm91c0r3q1z16"; + name = "qttranslations-everywhere-src-6.7.0.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz"; - sha256 = "0d517x60birlf8xb3sphchvgm235f8q1868q98kg76plzfhq57wq"; - name = "qtvirtualkeyboard-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz"; + sha256 = "0snbl1wd5s76c8ab76bsqi3bp94h1isdwavbjm6gc1hvifhv46yn"; + name = "qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz"; }; }; qtwayland = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwayland-everywhere-src-6.6.3.tar.xz"; - sha256 = "0gamcqpl302wlznfnlcg9vlnnhfpxgjnz05prwc9wpy0xh7wqvm9"; - name = "qtwayland-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz"; + sha256 = "1sks2m2phf841zl0d4sn7krm6f1ppgl7wl9arpc8i8vx47j70d6p"; + name = "qtwayland-everywhere-src-6.7.0.tar.xz"; }; }; qtwebchannel = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebchannel-everywhere-src-6.6.3.tar.xz"; - sha256 = "0cwcf4pri901piyj0lvqmks9l84di9rcafnfgrmgg5mls7jjlyvw"; - name = "qtwebchannel-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebchannel-everywhere-src-6.7.0.tar.xz"; + sha256 = "1zzg49ii59sw64m98phsbhf97kx7nxp7k0ggxazbz0hc9r0bvgr6"; + name = "qtwebchannel-everywhere-src-6.7.0.tar.xz"; }; }; qtwebengine = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebengine-everywhere-src-6.6.3.tar.xz"; - sha256 = "016qvbmdja2abajvsznnjdvblrmzgvs8s2dzlxws30hvna1xqavw"; - name = "qtwebengine-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebengine-everywhere-src-6.7.0.tar.xz"; + sha256 = "1pj7q5r8wa49faxijljfnbmzbpmqc7bwcal0mcwz9haxcd1s8nqs"; + name = "qtwebengine-everywhere-src-6.7.0.tar.xz"; }; }; qtwebsockets = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebsockets-everywhere-src-6.6.3.tar.xz"; - sha256 = "0dm066lv3n97ril9iyd5xn8j13m6r7xp844aagj6dpclaxv83x0n"; - name = "qtwebsockets-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebsockets-everywhere-src-6.7.0.tar.xz"; + sha256 = "0dlp2ck0pkg9say92qism438i5j3ybxs0xf90j7g3k9ndgd7gz2z"; + name = "qtwebsockets-everywhere-src-6.7.0.tar.xz"; }; }; qtwebview = { - version = "6.6.3"; + version = "6.7.0"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.3/submodules/qtwebview-everywhere-src-6.6.3.tar.xz"; - sha256 = "00jcxzi9wcbviscn5y0h0mkbac88lpjammg3zvfvjih7avgn6r10"; - name = "qtwebview-everywhere-src-6.6.3.tar.xz"; + url = "${mirror}/official_releases/qt/6.7/6.7.0/submodules/qtwebview-everywhere-src-6.7.0.tar.xz"; + sha256 = "1yawx8vd7blky5b8mxpby4k1zwgm91jvl98y17xf47yc71qy069n"; + name = "qtwebview-everywhere-src-6.7.0.tar.xz"; }; }; } |