diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-02-15 13:36:34 +0100 |
| commit | 2aa6f262cbb2052d604874223549ca44fd448a67 (patch) | |
| tree | 6a70e96bb9d87365f4bcbf8c58025a0d93c96078 /pkgs/top-level/release-cross.nix | |
| parent | f9e75352cf610360d43806bb09671d013c881cc9 (diff) | |
| parent | 1a52c7659dda87a8186d2a5482e49170b3989afa (diff) | |
| download | nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.gz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.bz2 nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.lz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.xz nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.tar.zst nixlib-2aa6f262cbb2052d604874223549ca44fd448a67.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 5b1294b0157e..8af1ca90267a 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -10,16 +10,13 @@ let coreutils.crossDrv = nativePlatforms; dropbear.crossDrv = nativePlatforms; tigervnc.crossDrv = nativePlatforms; - #openoffice.crossDrv = nativePlatforms; wxGTK.crossDrv = nativePlatforms; #firefox = nativePlatforms; xorg = { #xorgserver.crossDrv = nativePlatforms; }; nixUnstable.crossDrv = nativePlatforms; - linuxPackages_3_3.kernel.crossDrv = linux; linuxPackages_3_4.kernel.crossDrv = linux; - linuxPackages_3_6.kernel.crossDrv = linux; }; /* Basic list of packages to be natively built, @@ -36,7 +33,7 @@ in /* Test some cross builds to the Sheevaplug */ let crossSystem = { - config = "armv5tel-unknown-linux-gnueabi"; + config = "armv5tel-unknown-linux-gnueabi"; bigEndian = false; arch = "arm"; float = "soft"; @@ -57,7 +54,7 @@ in { /* Test some cross builds to the Sheevaplug - uclibc*/ let crossSystem = { - config = "armv5tel-unknown-linux-gnueabi"; + config = "armv5tel-unknown-linux-gnueabi"; bigEndian = false; arch = "arm"; float = "soft"; @@ -86,7 +83,7 @@ in { /* Test some cross builds to the mipsel */ let crossSystem = { - config = "mipsel-unknown-linux"; + config = "mipsel-unknown-linux"; bigEndian = false; arch = "mips"; float = "soft"; @@ -120,7 +117,7 @@ in { /* Test some cross builds to the ultrasparc */ let crossSystem = { - config = "sparc64-unknown-linux"; + config = "sparc64-unknown-linux"; bigEndian = true; arch = "sparc64"; float = "hard"; @@ -236,7 +233,7 @@ in { /* Linux on the fuloong */ let crossSystem = { - config = "mips64el-unknown-linux"; + config = "mips64el-unknown-linux"; bigEndian = false; arch = "mips"; float = "hard"; @@ -274,7 +271,7 @@ in { /* Linux on the Ben Nanonote */ let crossSystem = { - config = "mipsel-unknown-linux"; + config = "mipsel-unknown-linux"; bigEndian = false; arch = "mips"; float = "soft"; |