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

Merge pull request #25862 from obsidiansystems/linux-stdenv-cross

Browse Source 
linux cross stdenv: Fix eval errors
This commit is contained in:
John Ericson 2017-05-17 13:48:43 -04:00 committed by GitHub
commit 3e0b6b5141
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ let
}; };
scaleway-c1-crossSystem.crossSystem = armv7l-hf-multiplatform-crossSystem.crossSystem // rec { scaleway-c1-crossSystem.crossSystem = armv7l-hf-multiplatform-crossSystem.crossSystem // rec {
platform = pkgsNoParams.platforms.scaleway-c1; platform = lib.systems.platforms.scaleway-c1;
inherit (platform) gcc; inherit (platform) gcc;
inherit (gcc) fpu; inherit (gcc) fpu;
}; };
@ -73,9 +73,9 @@ let
config = "armv5tel-softfloat-linux-gnueabi"; config = "armv5tel-softfloat-linux-gnueabi";
float = "soft"; float = "soft";
platform = pkgsNoParams.platforms.pogoplug4; platform = lib.systems.platforms.pogoplug4;
inherit (pkgsNoParams.platforms.pogoplug4) gcc; inherit (lib.systems.platforms.pogoplug4) gcc;
libc = "glibc"; libc = "glibc";
withTLS = true; withTLS = true;