tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

ruby: disable yjit on cross

Fix `nix build .#pkgsCross.aarch64-multiplatform.ruby` failing
with:
```
partial linking yjit/target/release/libyjit.a into yjit/target/release/libyjit.o
/nix/store/…/bin/aarch64-unknown-linux-gnu-ld: yjit/target/release/libyjit.a(yjit.1fllkjkj80qowi7xzzkaw1xy8.rcgu.o): Relocations in generic ELF (EM: 62)
/nix/store/…/bin/aarch64-unknown-linux-gnu-ld: yjit/target/release/libyjit.a(yjit.1fllkjkj80qowi7xzzkaw1xy8.rcgu.o): Relocations in generic ELF (EM: 62)
/nix/store/…/bin/aarch64-unknown-linux-gnu-ld: yjit/target/release/libyjit.a(yjit.1fllkjkj80qowi7xzzkaw1xy8.rcgu.o): error adding symbols: file in wrong format
```

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Guilhem Saurel 4fce4c99 0a71472c

options
unified split
Changed files
+5 -1
pkgs
development
interpreters
ruby
default.nix
+5 -1
pkgs/development/interpreters/ruby/default.nix
··· 57 57 }: 58 58 let 59 59 ver = version; 60 + isCross = stdenv.buildPlatform != stdenv.hostPlatform; 60 61 # https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21 61 62 yjitSupported = 62 - stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64); 63 + !isCross 64 + && ( 65 + stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64) 66 + ); 63 67 rubyDrv = lib.makeOverridable ( 64 68 { 65 69 stdenv,