Unverified Commit 2f8d842d authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #239099 from wegank/qtwebengine-darwin-old 

qt6.qtwebengine: unbreak on x86_64-darwin
parents d4a7adb8 1447a580

pkgs/development/libraries/qt-6/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

pkgs/development/libraries/qt-6/modules/qtwebengine.nix

+2 −3
Original line number Diff line number Diff line
@@ -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;

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

+1 −0
Original line number Diff line number Diff line
@@ -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" ]