diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index b901985b3808..2ead9ba2e839 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -58,23 +58,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib' '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/bin/bun '' - # We currently cannot generate completions for x86_64-darwin because bun requires avx support to run, which is: - # 1. Not currently supported by the version of Rosetta on our aarch64 builders - # 2. Is not correctly detected even on macOS 15+, where it is available through Rosetta - # - # The baseline builds are no longer an option because they too now require avx support. - + - lib.optionalString - ( - stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform - && !(stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isx86_64) - ) - '' - installShellCompletion --cmd bun \ - --bash <(SHELL="bash" $out/bin/bun completions) \ - --zsh <(SHELL="zsh" $out/bin/bun completions) \ - --fish <(SHELL="fish" $out/bin/bun completions) - ''; + + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd bun \ + --bash <(SHELL="bash" $out/bin/bun completions) \ + --zsh <(SHELL="zsh" $out/bin/bun completions) \ + --fish <(SHELL="fish" $out/bin/bun completions) + ''; passthru = { sources = { @@ -134,8 +123,5 @@ stdenvNoCC.mkDerivation (finalAttrs: { # Broken for Musl at 2024-01-13, tracking issue: # https://github.com/NixOS/nixpkgs/issues/280716 broken = stdenvNoCC.hostPlatform.isMusl; - - # Hangs when run via Rosetta 2 on Apple Silicon - hydraPlatforms = lib.lists.remove "x86_64-darwin" lib.platforms.all; }; })