Skip to content

Commit

Permalink
deno: fix on x86_64-darwin
Browse files Browse the repository at this point in the history
It’s not clear to me what SDK version this actually ideally wants,
but `apple-sdk_11` is a conservative choice for now.
  • Loading branch information
emilazy committed Oct 11, 2024
1 parent 525d64f commit 627d690
Showing 1 changed file with 8 additions and 19 deletions.
27 changes: 8 additions & 19 deletions pkgs/by-name/de/deno/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
cmake,
protobuf,
installShellFiles,
libiconv,
darwin,
apple-sdk_11,
darwinMinVersionHook,
librusty_v8 ? callPackage ./librusty_v8.nix {
inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
},
Expand Down Expand Up @@ -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";

Expand Down Expand Up @@ -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" ];
};
}

0 comments on commit 627d690

Please sign in to comment.