pyrox.dev
lol
Merge pull request #239099 from wegank/qtwebengine-darwin-old
qt6.qtwebengine: unbreak on x86_64-darwin
authored by
Weijia Wang
and committed by
GitHub
2f8d842d
d4a7adb8
+4
-4
+1
-1
pkgs/development/libraries/qt-6/default.nix
+1
-1
pkgs/development/libraries/qt-6/default.nix
···
133
133
qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
134
134
qtwebengine = callPackage ./modules/qtwebengine.nix {
135
135
inherit (darwin) bootstrap_cmds cctools xnu;
136
-
inherit (darwin.apple_sdk_11_0) libpm libunwind;
136
+
inherit (darwin.apple_sdk_11_0) libpm libunwind llvmPackages_14;
137
137
inherit (darwin.apple_sdk_11_0.libs) sandbox;
138
138
inherit (darwin.apple_sdk_11_0.frameworks)
139
139
AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback
+2
-3
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
+2
-3
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
···
66
66
, xkeyboard_config
67
67
, enableProprietaryCodecs ? true
68
68
# darwin
69
-
, clang_14
69
+
, llvmPackages_14
70
70
, bootstrap_cmds
71
71
, cctools
72
72
, xcbuild
···
113
113
gn
114
114
nodejs
115
115
] ++ lib.optionals stdenv.isDarwin [
116
-
clang_14
116
+
llvmPackages_14.clang
117
117
bootstrap_cmds
118
118
cctools
119
119
xcbuild
···
309
309
meta = with lib; {
310
310
description = "A web engine based on the Chromium web browser";
311
311
platforms = platforms.unix;
312
-
broken = stdenv.isDarwin && stdenv.isx86_64;
313
312
# This build takes a long time; particularly on slow architectures
314
313
# 1 hour on 32x3.6GHz -> maybe 12 hours on 4x2.4GHz
315
314
timeout = 24 * 3600;