nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity

Fix nix_system_cpu on i686-linux

Browse source 
Fixes #13532.

(cherry picked from commit 54dc5314e8)
This commit is contained in:
Eelco Dolstra 2025-07-24 18:06:06 +02:00 • committed by Sergei Zimmerman
parent 359227ad14
commit a1efe99f5b
No known key found for this signature in database
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
powerpc_system_cpus = [ 'ppc64', 'ppc' ] powerpc_system_cpus = [ 'ppc64', 'ppc' ]
nix_system_cpu = {'ppc64' : 'powerpc64', 'ppc' : 'powerpc'}.get( nix_system_cpu = {'ppc64' : 'powerpc64', 'ppc' : 'powerpc', 'x86' : 'i686'}.get(
host_machine.cpu_family(), host_machine.cpu_family(),
host_machine.cpu_family(), host_machine.cpu_family(),
) )

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