diff options
| author | Ambroz Bizjak <ambrop7@gmail.com> | 2015-01-29 02:36:16 +0100 |
|---|---|---|
| committer | Ambroz Bizjak <ambrop7@gmail.com> | 2015-02-05 21:26:55 +0100 |
| commit | 8fb7d8bedec39eb14a19683656ed7622f2aa9fed (patch) | |
| tree | 18b3db420981bdf0b705d007761c956dcdc32e31 /pkgs/stdenv/linux/default.nix | |
| parent | cf317b85adc0fbe0644ae7977e9d82926f16f12d (diff) | |
| download | nixlib-8fb7d8bedec39eb14a19683656ed7622f2aa9fed.tar nixlib-8fb7d8bedec39eb14a19683656ed7622f2aa9fed.tar.gz nixlib-8fb7d8bedec39eb14a19683656ed7622f2aa9fed.tar.bz2 nixlib-8fb7d8bedec39eb14a19683656ed7622f2aa9fed.tar.lz nixlib-8fb7d8bedec39eb14a19683656ed7622f2aa9fed.tar.xz nixlib-8fb7d8bedec39eb14a19683656ed7622f2aa9fed.tar.zst nixlib-8fb7d8bedec39eb14a19683656ed7622f2aa9fed.zip | |
Fix building and unpacking of the ARM boostrap tools.
NOTE: This is incomplete - the tools need to be built, uploaded and the references fixed.
Diffstat (limited to 'pkgs/stdenv/linux/default.nix')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index e82338450688..f2d7747b03d2 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,7 +16,7 @@ rec { else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix else if system == "armv5tel-linux" then import ./bootstrap/armv5tel.nix else if system == "armv6l-linux" then import ./bootstrap/armv6l.nix - else if system == "armv7l-linux" then import ./bootstrap/armv6l.nix + else if system == "armv7l-linux" then import ./bootstrap/armv7l.nix else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix else abort "unsupported platform for the pure Linux stdenv"; @@ -42,10 +42,9 @@ rec { builder = bootstrapFiles.busybox; - args = - if system == "armv5tel-linux" || system == "armv6l-linux" + args = if system == "armv5tel-linux" || system == "armv6l-linux" || system == "armv7l-linux" - then [ ./scripts/unpack-bootstrap-tools-arm.sh ] + then [ "ash" "-e" ./scripts/unpack-bootstrap-tools-arm.sh ] else [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ]; tarball = bootstrapFiles.bootstrapTools; |