diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-22 08:28:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-22 08:28:23 +0300 |
| commit | 2f8d842d2e48aece7ef925756e1013ce6b5c5cd9 (patch) | |
| tree | e46e93ac288c49cf7097f7ed5a1a8cfad01098aa /pkgs/development/libraries | |
| parent | d4a7adb8abfdc742956d1641f2b4dac9adfda08b (diff) | |
| parent | 1447a5804b36cd8c40a8969ef540a486ffdb2ed2 (diff) | |
Merge pull request #239099 from wegank/qtwebengine-darwin-old
qt6.qtwebengine: unbreak on x86_64-darwin
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/qt-6/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 0f164fb3ce022..d9bc6ae15e1f8 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -133,7 +133,7 @@ let qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; qtwebengine = callPackage ./modules/qtwebengine.nix { inherit (darwin) bootstrap_cmds cctools xnu; - inherit (darwin.apple_sdk_11_0) libpm libunwind; + inherit (darwin.apple_sdk_11_0) libpm libunwind llvmPackages_14; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index fadbc5d2bfa3a..909616d953dee 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -66,7 +66,7 @@ , xkeyboard_config , enableProprietaryCodecs ? true # darwin -, clang_14 +, llvmPackages_14 , bootstrap_cmds , cctools , xcbuild @@ -113,7 +113,7 @@ qtModule { gn nodejs ] ++ lib.optionals stdenv.isDarwin [ - clang_14 + llvmPackages_14.clang bootstrap_cmds cctools xcbuild @@ -309,7 +309,6 @@ qtModule { meta = with lib; { description = "A web engine based on the Chromium web browser"; platforms = platforms.unix; - broken = stdenv.isDarwin && stdenv.isx86_64; # This build takes a long time; particularly on slow architectures # 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz timeout = 24 * 3600; |