diff --git a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index f33c716b1e82..5fd35f3cb914 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -30,9 +30,6 @@ cctools, libcxx, sigtool, - CoreFoundation, - CoreServices, - Foundation, # Allow to independently override the jdks used to build and run respectively buildJdk, runJdk, @@ -455,10 +452,6 @@ stdenv.mkDerivation rec { # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails export GCOV=${coreutils}/bin/false - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" - # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libcxx}/include/c++/v1" @@ -633,9 +626,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ cctools libcxx - CoreFoundation - CoreServices - Foundation ]; # Bazel makes extensive use of symlinks in the WORKSPACE. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58f4ab07d90a..04f8516c21a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7724,10 +7724,9 @@ with pkgs; bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 { inherit (darwin) sigtool; - inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk11_headless; runJdk = jdk11_headless; - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv + stdenv = if stdenv.cc.isClang then llvmPackages_17.stdenv else if stdenv.cc.isGNU then gcc12Stdenv else stdenv; bazel_self = bazel_5;