diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-11-01 16:19:17 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-11-01 16:22:00 -0400 |
commit | f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd (patch) | |
tree | b4a849d3fea4349f25eb27079577c9d3bfacacd5 /pkgs/stdenv/linux/make-bootstrap-tools.nix | |
parent | ffaffb36d152d2cba1da51332d4079a96cd5288d (diff) | |
download | nixpkgs-f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd.tar nixpkgs-f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd.tar.gz nixpkgs-f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd.tar.bz2 nixpkgs-f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd.tar.lz nixpkgs-f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd.tar.xz nixpkgs-f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd.tar.zst nixpkgs-f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd.zip |
linux bootstrap tools: Use right system for some raw derivations
This allows cross builds to work. Evidentallyy this has been done wrong since I combined the bootstrap tool creation files in ab651d2c9bab620ebe5e515476fbd70d2c5b0c61. Oops!
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools.nix')
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 3ebb4e634e2..58104e6ce26 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -201,19 +201,19 @@ in with pkgs; rec { bootstrapTools = if (stdenv.hostPlatform.libc == "glibc") then import ./bootstrap-tools { - inherit (stdenv.hostPlatform) system; + inherit (stdenv.buildPlatform) system; # Used to determine where to build inherit bootstrapFiles; } else if (stdenv.hostPlatform.libc == "musl") then import ./bootstrap-tools-musl { - inherit (stdenv.hostPlatform) system; + inherit (stdenv.buildPlatform) system; # Used to determine where to build inherit bootstrapFiles; } else throw "unsupported libc"; test = derivation { name = "test-bootstrap-tools"; - inherit (stdenv.hostPlatform) system; + inherit (stdenv.hostPlatform) system; # We cannot "cross test" builder = bootstrapFiles.busybox; args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ]; |