From 627d690bfb760139e38dfa988ea6f1d189dc2645 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 11 Oct 2024 19:46:23 +0100 Subject: [PATCH] deno: fix on `x86_64-darwin` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s not clear to me what SDK version this actually ideally wants, but `apple-sdk_11` is a conservative choice for now. --- pkgs/by-name/de/deno/package.nix | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index efb9cdcf794117..5f9ec28855627e 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -7,8 +7,8 @@ cmake, protobuf, installShellFiles, - libiconv, - darwin, + apple-sdk_11, + darwinMinVersionHook, librusty_v8 ? callPackage ./librusty_v8.nix { inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8; }, @@ -45,20 +45,12 @@ rustPlatform.buildRustPackage rec { protobuf installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin ( - [ - libiconv - darwin.libobjc - ] - ++ (with darwin.apple_sdk_11_0.frameworks; [ - Security - CoreServices - Metal - MetalPerformanceShaders - Foundation - QuartzCore - ]) - ); + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 + # V8 supports 10.15+; binary references `aligned_alloc` directly + (darwinMinVersionHook "10.15") + ]; buildAndTestSubdir = "cli"; @@ -116,8 +108,5 @@ rustPlatform.buildRustPackage rec { "x86_64-darwin" "aarch64-darwin" ]; - # NOTE: `aligned_alloc` error on darwin SDK < 10.15. Can't do usual overrideSDK with rust toolchain in current implementation. - # Should be fixed with darwin SDK refactor and can be revisited. - badPlatforms = [ "x86_64-darwin" ]; }; }