dockerTools: pkgs.system -> pkgs.stdenv.hostPlatform.system
`pkgs.system` is an alias
This commit is contained in:
parent
1b9fa5ade6
commit
76636e0099
|
@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||||
let
|
let
|
||||||
|
|
||||||
remoteSystem =
|
remoteSystem =
|
||||||
if pkgs.system == "aarch64-linux"
|
if pkgs.stdenv.hostPlatform.system == "aarch64-linux"
|
||||||
then "x86_64-linux"
|
then "x86_64-linux"
|
||||||
else "aarch64-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
|
# 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
|
# cross-compile _to_ a different system but _from_ a different system
|
||||||
crossSystem = pkgs.system;
|
crossSystem = pkgs.stdenv.hostPlatform.system;
|
||||||
};
|
};
|
||||||
|
|
||||||
hello1 = remoteCrossPkgs.dockerTools.buildImage {
|
hello1 = remoteCrossPkgs.dockerTools.buildImage {
|
||||||
|
|
|
@ -315,7 +315,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
|
||||||
"docker inspect ${pkgs.dockerTools.examples.cross.imageName} "
|
"docker inspect ${pkgs.dockerTools.examples.cross.imageName} "
|
||||||
+ "| ${pkgs.jq}/bin/jq -r .[].Architecture"
|
+ "| ${pkgs.jq}/bin/jq -r .[].Architecture"
|
||||||
).strip()
|
).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"):
|
with subtest("buildLayeredImage doesn't dereference /nix/store symlink layers"):
|
||||||
|
|
|
@ -486,7 +486,7 @@ rec {
|
||||||
cross = let
|
cross = let
|
||||||
# Cross compile for x86_64 if on aarch64
|
# Cross compile for x86_64 if on aarch64
|
||||||
crossPkgs =
|
crossPkgs =
|
||||||
if pkgs.system == "aarch64-linux" then pkgsCross.gnu64
|
if pkgs.stdenv.hostPlatform.system == "aarch64-linux" then pkgsCross.gnu64
|
||||||
else pkgsCross.aarch64-multiplatform;
|
else pkgsCross.aarch64-multiplatform;
|
||||||
in crossPkgs.dockerTools.buildImage {
|
in crossPkgs.dockerTools.buildImage {
|
||||||
name = "hello-cross";
|
name = "hello-cross";
|
||||||
|
|
Loading…
Reference in a new issue