From bbc494644f1c10bb7ecf60dd6bd5cf72cb98e223 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 5 Jan 2013 22:14:59 +0400 Subject: [PATCH] ARMv7 seems to need special ARM unpacking procedure, too --- pkgs/stdenv/linux/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 5d9a0cf750a..45ba2c58811 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -58,9 +58,10 @@ rec { builder = bootstrapFiles.sh; args = - if (system == "armv5tel-linux" || system == "armv6l-linux") - then [ ./scripts/unpack-bootstrap-tools-arm.sh ] - else [ ./scripts/unpack-bootstrap-tools.sh ]; + if (system == "armv5tel-linux" || system == "armv6l-linux" + || system == "armv7l-linux") + then ./scripts/unpack-bootstrap-tools-arm.sh + else ./scripts/unpack-bootstrap-tools.sh; inherit (bootstrapFiles) bzip2 mkdir curl cpio;