mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
nixos: Fix use of nixpkgs.localSystem
localSystem is ill-defined because unlike hostPlatform, its meaning is different in a cross or non-cross context.
This commit is contained in:
parent
16de63fcc5
commit
e153087276
|
@ -186,7 +186,7 @@ in
|
|||
|
||||
dysnomia.properties = {
|
||||
hostname = config.networking.hostName;
|
||||
inherit (config.nixpkgs.localSystem) system;
|
||||
inherit (pkgs.stdenv.hostPlatform) system;
|
||||
|
||||
supportedTypes = [
|
||||
"echo"
|
||||
|
|
|
@ -132,7 +132,7 @@ let
|
|||
|
||||
# If the host is 64-bit and the container is 32-bit, add a
|
||||
# --personality flag.
|
||||
${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") ''
|
||||
${optionalString (pkgs.stdenv.hostPlatform.system == "x86_64-linux") ''
|
||||
if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then
|
||||
extraFlags+=" --personality=x86"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue