linux cross stdenv: Pull platforms from lib to cut eval time

This commit is contained in:
John Ericson 2017-04-25 19:54:25 -04:00
parent 49c99b70cf
commit 78bb5f5f37

View file

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