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

Merge pull request #25225 from Ericson2314/linux-cross-stdenv-eval

Browse Source 
linux cross stdenv: Pull platforms from lib to cut eval time
This commit is contained in:
John Ericson 2017-04-25 20:01:46 -04:00 committed by GitHub
commit 6cb0f0bcd9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View File

@ -3,8 +3,8 @@
let buildFor = toolsArch: ( let buildFor = toolsArch: (
let let
lib = import ../../../lib;
pkgsFun = import ../../..; pkgsFun = import ../../..;
pkgsNoParams = pkgsFun {};
sheevaplugCrossSystem = { sheevaplugCrossSystem = {
crossSystem = rec { crossSystem = rec {
@ -14,7 +14,7 @@ let
float = "soft"; float = "soft";
withTLS = true; withTLS = true;
libc = "glibc"; libc = "glibc";
platform = pkgsNoParams.platforms.sheevaplug; platform = lib.systems.platforms.sheevaplug;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
inherit (platform) gcc; inherit (platform) gcc;
}; };
@ -29,7 +29,7 @@ let
fpu = "vfp"; fpu = "vfp";
withTLS = true; withTLS = true;
libc = "glibc"; libc = "glibc";
platform = pkgsNoParams.platforms.raspberrypi; platform = lib.systems.platforms.raspberrypi;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
inherit (platform) gcc; inherit (platform) gcc;
}; };
@ -44,7 +44,7 @@ let
fpu = "vfpv3-d16"; fpu = "vfpv3-d16";
withTLS = true; withTLS = true;
libc = "glibc"; libc = "glibc";
platform = pkgsNoParams.platforms.armv7l-hf-multiplatform; platform = lib.systems.platforms.armv7l-hf-multiplatform;
openssl.system = "linux-generic32"; openssl.system = "linux-generic32";
inherit (platform) gcc; inherit (platform) gcc;
}; };
@ -57,7 +57,7 @@ let
arch = "aarch64"; arch = "aarch64";
withTLS = true; withTLS = true;
libc = "glibc"; libc = "glibc";
platform = pkgsNoParams.platforms.aarch64-multiplatform; platform = lib.systems.platforms.aarch64-multiplatform;
inherit (platform) gcc; inherit (platform) gcc;
}; };
}; };