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

More changes beyond stdenv-linux for the fuloong2f platform

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=22973
This commit is contained in:
Lluís Batlle i Rossell 2010-08-05 18:51:12 +00:00
parent b7f47c7f49
commit 8783e812b5
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/lib/platforms.nix
View File

@ -2,7 +2,8 @@ let lists = import ./lists.nix; in
rec { rec {
gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */ gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux" ]; linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux"
"ict_loongson-2_v0.3_fpu_v0.1-linux"];
darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"]; darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"];
freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"]; freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"];
openbsd = ["i686-openbsd" "x86_64-openbsd"]; openbsd = ["i686-openbsd" "x86_64-openbsd"];

3
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -41,7 +41,7 @@
}: }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
|| stdenv.system == "armv5tel-linux"; || stdenv.system == "armv5tel-linux" || stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux";
assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
@ -96,6 +96,7 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "armv5tel-linux" then "arm" else if stdenv.system == "armv5tel-linux" then "arm" else
if stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then "mips" else
abort "Platform ${stdenv.system} is not supported."; abort "Platform ${stdenv.system} is not supported.";
crossAttrs = let crossAttrs = let

1
pkgs/top-level/platforms.nix
View File

@ -203,5 +203,6 @@ rec {
FUSE_FS m FUSE_FS m
''; '';
kernelTarget = "vmlinux"; kernelTarget = "vmlinux";
uboot = null;
}; };
} }