Loading pkgs/development/libraries/qt-5/5.15/default.nix +0 −28 Original line number Diff line number Diff line Loading @@ -189,18 +189,6 @@ let hash = "sha256-B/z/+tai01RU/bAJSCp5a0/dGI8g36nwso8MiJv27YM="; }) ]; qtwebengine = [ ./qtwebengine-link-pulseaudio.patch # Fixes Chromium build failure with Ninja 1.12. # See: https://bugreports.qt.io/browse/QTBUG-124375 # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09 ./qtwebengine-ninja-1.12.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ./qtwebengine-darwin-checks.patch ]; qtwebkit = [ (fetchpatch { name = "qtwebkit-python39-json.patch"; Loading Loading @@ -315,22 +303,6 @@ let qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix { }; qtwayland = callPackage ../modules/qtwayland.nix { }; qtwebchannel = callPackage ../modules/qtwebchannel.nix { }; qtwebengine = # Actually propagating stdenv change let # Won’t build with Clang 20, as `-Wenum-constexpr-conversion` # was made a hard error. # qt5webengine no longer maintained, FTBFS with GCC 15 stdenv' = if stdenv.cc.isClang then llvmPackages_19.stdenv else gcc14Stdenv; qtModule' = qtModuleWithStdenv stdenv'; in callPackage ../modules/qtwebengine.nix { inherit (srcs.qtwebengine) version; inherit (darwin) bootstrap_cmds; stdenv = stdenv'; qtModule = qtModule'; python = python3; }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix { }; qtwebkit = callPackage ../modules/qtwebkit.nix { }; qtwebsockets = callPackage ../modules/qtwebsockets.nix { }; Loading pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patchdeleted 100644 → 0 +0 −29 Original line number Diff line number Diff line diff --git a/configure.pri b/configure.pri index 3a33bdc82..c1460b8b5 100644 --- a/configure.pri +++ b/configure.pri @@ -442,24 +442,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { } defineTest(qtwebengine_isMacOsPlatformSupported) { - !qtwebengine_isMinXcodeVersion(10, 0, 0) { - qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.") - return(false) - } - !clang|intel_icc { - qtwebengine_platformError("requires Clang.") - return(false) - } - # We require macOS 10.13 (darwin version 17.0.0) or newer. - darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 17) { - qtwebengine_platformError("requires macOS version 10.13 or newer.") - return(false) - } - !qtwebengine_isMinOSXSDKVersion(10, 13): { - qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") - return(false) - } CONFIG(debug, debug|release):isUniversal(){ qtwebengine_platformError("Universal builds can not be done with debug configuration due to large binary size.") return(false) pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patchdeleted 100644 → 0 +0 −12 Original line number Diff line number Diff line diff a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri --- a/src/buildtools/config/mac_osx.pri +++ b/src/buildtools/config/mac_osx.pri @@ -5,8 +5,6 @@ load(functions) # otherwise query for it. QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) isEmpty(QMAKE_MAC_SDK_VERSION) { - QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") - isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") } # chromium/build/mac/find_sdk.py expects the SDK version (mac_sdk_min) in Major.Minor format. pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patchdeleted 100644 → 0 +0 −8 Original line number Diff line number Diff line --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -47,3 +47,5 @@ !qtConfig(webengine-nodejs10): gn_args += use_rollup=false gn_args += enable_ipc_logging=false + +gn_args += link_pulseaudio=true pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patchdeleted 100644 → 0 +0 −12 Original line number Diff line number Diff line diff a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn --- a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn +++ b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn @@ -184,8 +184,6 @@ template("mac_toolchain") { # If dSYMs are enabled, this flag will be added to the link tools. if (_enable_dsyms) { dsym_switch = " -Wcrl,dsym,{{root_out_dir}} " - dsym_switch += "-Wcrl,dsymutilpath," + - "${prefix}dsymutil" + " " dsym_output_dir = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM" Loading
pkgs/development/libraries/qt-5/5.15/default.nix +0 −28 Original line number Diff line number Diff line Loading @@ -189,18 +189,6 @@ let hash = "sha256-B/z/+tai01RU/bAJSCp5a0/dGI8g36nwso8MiJv27YM="; }) ]; qtwebengine = [ ./qtwebengine-link-pulseaudio.patch # Fixes Chromium build failure with Ninja 1.12. # See: https://bugreports.qt.io/browse/QTBUG-124375 # Backport of: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=a766045f65f934df3b5f1aa63bc86fbb3e003a09 ./qtwebengine-ninja-1.12.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ./qtwebengine-darwin-checks.patch ]; qtwebkit = [ (fetchpatch { name = "qtwebkit-python39-json.patch"; Loading Loading @@ -315,22 +303,6 @@ let qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix { }; qtwayland = callPackage ../modules/qtwayland.nix { }; qtwebchannel = callPackage ../modules/qtwebchannel.nix { }; qtwebengine = # Actually propagating stdenv change let # Won’t build with Clang 20, as `-Wenum-constexpr-conversion` # was made a hard error. # qt5webengine no longer maintained, FTBFS with GCC 15 stdenv' = if stdenv.cc.isClang then llvmPackages_19.stdenv else gcc14Stdenv; qtModule' = qtModuleWithStdenv stdenv'; in callPackage ../modules/qtwebengine.nix { inherit (srcs.qtwebengine) version; inherit (darwin) bootstrap_cmds; stdenv = stdenv'; qtModule = qtModule'; python = python3; }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix { }; qtwebkit = callPackage ../modules/qtwebkit.nix { }; qtwebsockets = callPackage ../modules/qtwebsockets.nix { }; Loading
pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-checks.patchdeleted 100644 → 0 +0 −29 Original line number Diff line number Diff line diff --git a/configure.pri b/configure.pri index 3a33bdc82..c1460b8b5 100644 --- a/configure.pri +++ b/configure.pri @@ -442,24 +442,6 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { } defineTest(qtwebengine_isMacOsPlatformSupported) { - !qtwebengine_isMinXcodeVersion(10, 0, 0) { - qtwebengine_platformError("requires at least version 10.0.0, but using Xcode version $${QMAKE_XCODE_VERSION}.") - return(false) - } - !clang|intel_icc { - qtwebengine_platformError("requires Clang.") - return(false) - } - # We require macOS 10.13 (darwin version 17.0.0) or newer. - darwin_major_version = $$section(QMAKE_HOST.version, ., 0, 0) - lessThan(darwin_major_version, 17) { - qtwebengine_platformError("requires macOS version 10.13 or newer.") - return(false) - } - !qtwebengine_isMinOSXSDKVersion(10, 13): { - qtwebengine_platformError("requires a macOS SDK version of 10.13 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") - return(false) - } CONFIG(debug, debug|release):isUniversal(){ qtwebengine_platformError("Universal builds can not be done with debug configuration due to large binary size.") return(false)
pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patchdeleted 100644 → 0 +0 −12 Original line number Diff line number Diff line diff a/src/buildtools/config/mac_osx.pri b/src/buildtools/config/mac_osx.pri --- a/src/buildtools/config/mac_osx.pri +++ b/src/buildtools/config/mac_osx.pri @@ -5,8 +5,6 @@ load(functions) # otherwise query for it. QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) isEmpty(QMAKE_MAC_SDK_VERSION) { - QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null") - isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") } # chromium/build/mac/find_sdk.py expects the SDK version (mac_sdk_min) in Major.Minor format.
pkgs/development/libraries/qt-5/5.15/qtwebengine-link-pulseaudio.patchdeleted 100644 → 0 +0 −8 Original line number Diff line number Diff line --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -47,3 +47,5 @@ !qtConfig(webengine-nodejs10): gn_args += use_rollup=false gn_args += enable_ipc_logging=false + +gn_args += link_pulseaudio=true
pkgs/development/libraries/qt-5/5.15/qtwebengine-mac-dont-set-dsymutil-path.patchdeleted 100644 → 0 +0 −12 Original line number Diff line number Diff line diff a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn --- a/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn +++ b/src/3rdparty/chromium/build/toolchain/mac/BUILD.gn @@ -184,8 +184,6 @@ template("mac_toolchain") { # If dSYMs are enabled, this flag will be added to the link tools. if (_enable_dsyms) { dsym_switch = " -Wcrl,dsym,{{root_out_dir}} " - dsym_switch += "-Wcrl,dsymutilpath," + - "${prefix}dsymutil" + " " dsym_output_dir = "{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM"