diff options
| author | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-04-05 10:18:44 +1000 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2022-04-05 10:19:40 +1000 |
| commit | 76636e00998bd095c083b107ec76a51b3c17aab1 (patch) | |
| tree | dc11a951c8bbbd3e69e40b26ef88892233863967 | |
| parent | 1b9fa5ade6c180b6976aa738fa1b826b607c4a74 (diff) | |
dockerTools: pkgs.system -> pkgs.stdenv.hostPlatform.system
`pkgs.system` is an alias
| -rw-r--r-- | nixos/tests/docker-tools-cross.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/docker-tools.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/docker/examples.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix index a7a6a31475d67..8791ec2581279 100644 --- a/nixos/tests/docker-tools-cross.nix +++ b/nixos/tests/docker-tools-cross.nix @@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let remoteSystem = - if pkgs.system == "aarch64-linux" + if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then "x86_64-linux" else "aarch64-linux"; @@ -18,7 +18,7 @@ let # NOTE: Since this file can't control where the test will be _run_ we don't # cross-compile _to_ a different system but _from_ a different system - crossSystem = pkgs.system; + crossSystem = pkgs.stdenv.hostPlatform.system; }; hello1 = remoteCrossPkgs.dockerTools.buildImage { diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 8a240ddb17f24..80859ac7a96ec 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -315,7 +315,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker inspect ${pkgs.dockerTools.examples.cross.imageName} " + "| ${pkgs.jq}/bin/jq -r .[].Architecture" ).strip() - == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}" + == "${if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then "amd64" else "arm64"}" ) with subtest("buildLayeredImage doesn't dereference /nix/store symlink layers"): diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 941ee048666d0..169edb171db41 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -486,7 +486,7 @@ rec { cross = let # Cross compile for x86_64 if on aarch64 crossPkgs = - if pkgs.system == "aarch64-linux" then pkgsCross.gnu64 + if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then pkgsCross.gnu64 else pkgsCross.aarch64-multiplatform; in crossPkgs.dockerTools.buildImage { name = "hello-cross"; |