From ff37bd99e79834cca226aabdbf8c055cc9390bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 25 Apr 2026 01:08:36 +1000 Subject: [PATCH] spidermonkey_{115,128,140}: provide sdkroot directly We don't need xcbuild for discovery. --- .../development/interpreters/spidermonkey/common.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix index a8d37f457f3d..dd4bfcb45b7d 100644 --- a/pkgs/development/interpreters/spidermonkey/common.nix +++ b/pkgs/development/interpreters/spidermonkey/common.nix @@ -21,7 +21,6 @@ rustc, which, zip, - xcbuild, # runtime icu75, @@ -32,6 +31,9 @@ libiconv, }: +let + apple-sdk = (if (lib.versionAtLeast version "140") then apple-sdk_15 else apple-sdk_14); +in stdenv.mkDerivation (finalAttrs: { pname = "spidermonkey"; inherit version; @@ -87,9 +89,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals (lib.versionAtLeast version "128") [ rust-cbindgen rustPlatform.bindgenHook - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - xcbuild ]; buildInputs = [ @@ -100,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv - (if (lib.versionAtLeast version "140") then apple-sdk_15 else apple-sdk_14) + apple-sdk ]; depsBuildBuild = [ @@ -129,6 +128,9 @@ stdenv.mkDerivation (finalAttrs: { # https://bugzilla.mozilla.org/show_bug.cgi?id=1957023 "--includedir=${placeholder "dev"}/include" ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "--with-macos-sdk=${apple-sdk.sdkroot}" + ] ++ [ "--disable-jemalloc" "--disable-strip"