From 0f3ba89b2a3b306f9a8a4ae68a0364af62eb1c06 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 25 Oct 2024 13:32:26 +0100
Subject: [PATCH 1/2] javaPackages.openjdk{8,11,17}-bootstrap: fix eval on
 Darwin

---
 pkgs/top-level/java-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index bef177372945..020d505d9825 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -31,9 +31,9 @@ with pkgs;
     openjdk23 = mkOpenjdk "23" ../development/compilers/zulu/23.nix;
 
     # Legacy aliases
-    openjdk8-bootstrap = openjdk8.jdk-bootstrap;
-    openjdk11-bootstrap = openjdk11.jdk-bootstrap;
-    openjdk17-bootstrap = openjdk17.jdk-bootstrap;
+    openjdk8-bootstrap = temurin-bin.jdk-8;
+    openjdk11-bootstrap = temurin-bin.jdk-11;
+    openjdk17-bootstrap = temurin-bin.jdk-17;
 
     temurin-bin = recurseIntoAttrs (callPackage (
       if stdenv.hostPlatform.isLinux

From 2fefc70f9c5e8f65b1909c258cc00bad296adbd7 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 26 Oct 2024 20:20:38 -0400
Subject: [PATCH 2/2] ispc: drop impure Xcode dependency

The new Darwin SDK pattern allows ispc to be built without requiring an
impure Xcode.
---
 pkgs/development/compilers/ispc/default.nix | 6 ++----
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 2aa173fdde24..40d13c84e187 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub
-, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode, tbb
+, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, tbb
   # the default test target is sse4, but that is not supported by all Hydra agents
 , testedTargets ? if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-1Ns8w34fXgYrSu3XE89uowjaVoW3MOgKYV1Jb/XRj1Q=";
   };
 
-  nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [ xcode ];
+  nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ];
 
   buildInputs = with llvmPackages; [
     libllvm libclang openmp ncurses
@@ -63,8 +63,6 @@ stdenv.mkDerivation rec {
     "-DISPC_INCLUDE_UTILS=OFF"
     ("-DARM_ENABLED=" + (if stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32 then "TRUE" else "FALSE"))
     ("-DX86_ENABLED=" + (if stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isx86_32 then "TRUE" else "FALSE"))
-  ] ++ lib.lists.optionals stdenv.hostPlatform.isDarwin [
-    "-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c36684541f48..a900e6712c5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20312,7 +20312,6 @@ with pkgs;
   isort = with python3Packages; toPythonApplication isort;
 
   ispc = callPackage ../development/compilers/ispc {
-    xcode = darwin.xcode_14;
     llvmPackages = llvmPackages_17;
   };