MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-15 22:36:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

qt6.qtwebengine: unbreak on x86_64-darwin

Browse source
This commit is contained in:
Weijia Wang 2023-06-22 07:23:21 +03:00
parent df469dd8cd
commit 1447a5804b
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/qt-6/default.nix
View file

@ -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

5
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
View file

@ -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;

1
pkgs/os-specific/darwin/apple-sdk-11.0/default.nix
View file

@ -75,6 +75,7 @@ let
name = "llvmPackages_${v}";
value = pkgs."llvmPackages_${v}" // {
stdenv = mkStdenv pkgs."llvmPackages_${v}".stdenv;
clang = mkCc pkgs."llvmPackages_${v}".clang;
};
})
[ "12" "13" "14" "15" "16" ]