diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-21 08:43:10 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-21 08:43:10 +0100 |
commit | 1ffd7cf0d6cb509565deb21a6e57a17575834b76 (patch) | |
tree | 60b348740eec1eac0730c50016372762141836d9 /pkgs/build-support | |
parent | 553b7a8bf08cfdcf5bd64c5118f4a4fec640f93b (diff) | |
parent | 65c4e2500f25076a2db330b8953410faab817420 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/docker/examples.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index cd91c721241b..3f30f1a2adb4 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -408,10 +408,15 @@ rec { }; # basic example, with cross compilation - cross-aarch64 = pkgsCross.aarch64-multiplatform.dockerTools.buildImage { + cross = let + # Cross compile for x86_64 if on aarch64 + crossPkgs = + if pkgs.system == "aarch64-linux" then pkgsCross.gnu64 + else pkgsCross.aarch64-multiplatform; + in crossPkgs.dockerTools.buildImage { name = "hello-cross"; tag = "latest"; - contents = pkgsCross.aarch64-multiplatform.hello; + contents = crossPkgs.hello; }; } |