public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pi-stdenv-updates' into stdenv-updates

Browse Source 
This adds raspberry pi support. I've almost tested all.

Should fix https://github.com/NixOS/nixpkgs/issues/234
This commit is contained in:
Lluís Batlle i Rossell
2012-12-31 16:03:16 +00:00
parent df65a79bb3 2402bb2613
commit d16f4bb3ed
17 changed files with 668 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/stdenv/linux/default.nix
View File

@@ -16,6 +16,7 @@ rec {
else if system == "x86_64-linux" then import ./bootstrap/x86_64
else if system == "powerpc-linux" then import ./bootstrap/powerpc
else if system == "armv5tel-linux" then import ./bootstrap/armv5tel
else if system == "armv6l-linux" then import ./bootstrap/armv6l
else if system == "armv7l-linux" then import ./bootstrap/armv5tel
else if system == "mips64el-linux" then import ./bootstrap/loongson2f
else abort "unsupported platform for the pure Linux stdenv";
@@ -57,7 +58,7 @@ rec {
builder = bootstrapFiles.sh;
args =
if system == "armv5tel-linux"
if (system == "armv5tel-linux" || system == "armv6l-linux")
then [ ./scripts/unpack-bootstrap-tools-arm.sh ]
else [ ./scripts/unpack-bootstrap-tools.sh ];
@@ -273,7 +274,7 @@ rec {
inherit (stdenvLinuxBoot3Pkgs) binutils;
inherit (stdenvLinuxBoot4Pkgs) coreutils;
libc = stdenvLinuxGlibc;
gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
gcc = stdenvLinuxBoot4.gcc.gcc;
shell = stdenvLinuxBoot4Pkgs.bash + "/bin/bash";
name = "";
};