nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 20:16:03 +01:00
Code Activity

Merge pull request #13540 from NixOS/mergify/bp/2.29-maintenance/pr-13535

Browse source 
Fix nix_system_cpu on i686-linux (backport #13535)
This commit is contained in:
Eelco Dolstra 2025-07-25 02:08:52 +02:00 • committed by GitHub
commit c1f54da018
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nix-meson-build-support/default-system-cpu/meson.build
View file

@ -1,9 +1,10 @@
nix_system_cpu = { powerpc_system_cpus = [ 'ppc64', 'ppc' ]
'ppc64' : 'powerpc64',
'ppc64le' : 'powerpc64le', nix_system_cpu = {'ppc64' : 'powerpc64', 'ppc' : 'powerpc', 'x86' : 'i686'}.get(
'ppc' : 'powerpc',
'ppcle' : 'powerpcle',
}.get(
host_machine.cpu_family(), host_machine.cpu_family(),
host_machine.cpu_family(), host_machine.cpu_family(),
) )
if powerpc_system_cpus.contains(host_machine.cpu_family()) and host_machine.endian() == 'little'
nix_system_cpu += 'le'
endif

4
tests/functional/misc.sh
View file

@ -44,3 +44,7 @@ out="$(expectStderr 0 nix-instantiate --option foobar baz --expr '{}')"
out="$(expectStderr 0 nix-instantiate '{}' --option foobar baz --expr )" out="$(expectStderr 0 nix-instantiate '{}' --option foobar baz --expr )"
[[ "$(echo "$out" | grep foobar | wc -l)" = 1 ]] [[ "$(echo "$out" | grep foobar | wc -l)" = 1 ]]
if [[ $(uname) = Linux && $(uname -m) = i686 ]]; then
[[ $(nix config show system) = i686-linux ]]
fi