diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-04-25 20:01:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 20:01:46 -0400 |
| commit | 6cb0f0bcd9758a1c68f2acd564f329476c2365ea (patch) | |
| tree | 6b34433014d1021c0677b823ff4e6b56e8b5f678 /pkgs/stdenv | |
| parent | 5dd731b801ac6a0203204a7eed19afddee93fe85 (diff) | |
| parent | 78bb5f5f3775e220e5d4bbe30851dd7fec072bf8 (diff) | |
| download | nixpkgs-6cb0f0bcd9758a1c68f2acd564f329476c2365ea.tar nixpkgs-6cb0f0bcd9758a1c68f2acd564f329476c2365ea.tar.gz nixpkgs-6cb0f0bcd9758a1c68f2acd564f329476c2365ea.tar.bz2 nixpkgs-6cb0f0bcd9758a1c68f2acd564f329476c2365ea.tar.lz nixpkgs-6cb0f0bcd9758a1c68f2acd564f329476c2365ea.tar.xz nixpkgs-6cb0f0bcd9758a1c68f2acd564f329476c2365ea.tar.zst nixpkgs-6cb0f0bcd9758a1c68f2acd564f329476c2365ea.zip | |
Merge pull request #25225 from Ericson2314/linux-cross-stdenv-eval
linux cross stdenv: Pull platforms from lib to cut eval time
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 613edfafd95..8b166fb5b49 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -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; }; }; |