diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-17 18:04:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 18:04:59 -0400 |
| commit | b32fd0c093adc7d1f22ab6e1813d91b6607d2b7b (patch) | |
| tree | 9d0df56ec61861c4ba666ea407683ce488b0968e /pkgs/build-support | |
| parent | 879f851cfceaa5f10086b9f5b176a12f3f1e047f (diff) | |
| parent | 8166bc934b254d61ea059f63764632fc2785d9da (diff) | |
| download | nixpkgs-b32fd0c093adc7d1f22ab6e1813d91b6607d2b7b.tar nixpkgs-b32fd0c093adc7d1f22ab6e1813d91b6607d2b7b.tar.gz nixpkgs-b32fd0c093adc7d1f22ab6e1813d91b6607d2b7b.tar.bz2 nixpkgs-b32fd0c093adc7d1f22ab6e1813d91b6607d2b7b.tar.lz nixpkgs-b32fd0c093adc7d1f22ab6e1813d91b6607d2b7b.tar.xz nixpkgs-b32fd0c093adc7d1f22ab6e1813d91b6607d2b7b.tar.zst nixpkgs-b32fd0c093adc7d1f22ab6e1813d91b6607d2b7b.zip | |
Merge pull request #68898 from nspin/pr/docker-image-cross
build-support/docker: set default image arch to host arch
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 83e21c8945d..37b25232b96 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,4 +1,5 @@ { + buildPackages, cacert, callPackage, closureInfo, @@ -47,7 +48,7 @@ rec { , imageDigest , sha256 , os ? "linux" - , arch ? "amd64" + , arch ? buildPackages.go.GOARCH # This is used to set name to the pulled image , finalImageName ? imageName @@ -540,7 +541,7 @@ rec { configJson = let pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; - architecture = "amd64"; + architecture = buildPackages.go.GOARCH; os = "linux"; }); impure = runCommand "${baseName}-standard-dynamic-date.json" @@ -658,7 +659,7 @@ rec { baseJson = let pure = writeText "${baseName}-config.json" (builtins.toJSON { inherit created config; - architecture = "amd64"; + architecture = buildPackages.go.GOARCH; os = "linux"; }); impure = runCommand "${baseName}-config.json" |