diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-04-19 14:59:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 14:59:58 -0400 |
| commit | 53686e89951f33906cb1a8d7d5badc4671ae90e4 (patch) | |
| tree | 076559719b8cc7d959be64abf6a585f5831bc90c /nixos/modules/virtualisation | |
| parent | 7287129e51be7b99e9896c3401bd4c4c9c3dd1de (diff) | |
| parent | c6f7d4367894047592cc412740f0c1f5b2ca2b59 (diff) | |
| download | nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.gz nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.bz2 nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.lz nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.xz nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.zst nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.zip | |
Merge pull request #38485 from obsidiansystems/nixos-nixpkgs-options
nixpkgs module: Clean up platform options
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/containers.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e54a5fe7d40..7ec443248de 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -112,7 +112,7 @@ let # If the host is 64-bit and the container is 32-bit, add a # --personality flag. - ${optionalString (config.nixpkgs.system == "x86_64-linux") '' + ${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") '' if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then extraFlags+=" --personality=x86" fi @@ -255,7 +255,7 @@ let }; - system = config.nixpkgs.system; + system = config.nixpkgs.localSystem.system; bindMountOpts = { name, config, ... }: { |