Merge staging-next into staging

2020-11-21 08:43:37 +01:00
parent 8d210e2ea4 1ffd7cf0d6
commit 54cb417ba0
129 changed files with 5263 additions and 10739 deletions
--- 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;
  };

 }