diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 16:39:54 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 16:39:54 +0000 |
| commit | 33d3cf2d1c86fa537d0c563668db9d99f331f299 (patch) | |
| tree | ef11ae62ede6821e6fac161d255f5c5711c55762 /pkgs/stdenv | |
| parent | ab2520c383b430d8ea5a6159779b1dcee3258038 (diff) | |
| download | nixlib-33d3cf2d1c86fa537d0c563668db9d99f331f299.tar nixlib-33d3cf2d1c86fa537d0c563668db9d99f331f299.tar.gz nixlib-33d3cf2d1c86fa537d0c563668db9d99f331f299.tar.bz2 nixlib-33d3cf2d1c86fa537d0c563668db9d99f331f299.tar.lz nixlib-33d3cf2d1c86fa537d0c563668db9d99f331f299.tar.xz nixlib-33d3cf2d1c86fa537d0c563668db9d99f331f299.tar.zst nixlib-33d3cf2d1c86fa537d0c563668db9d99f331f299.zip | |
Fixes in make-bootstrap-tools-crosspi.nix
It doesn't reference <nixpkgs> anymore. And I fixed the indentation.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix index afc5ed3d5c38..8f58efe750fe 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix @@ -1,49 +1,49 @@ {system ? builtins.currentSystem}: let - pkgsFun = import <nixpkgs/default.nix>; # The root nixpkgs default.nix + pkgsFun = import ../../top-level/all-packages.nix; pkgsNoParams = pkgsFun {}; raspberrypiCrossSystem = { crossSystem = { - config = "armv6l-unknown-linux-gnueabi"; - bigEndian = false; - arch = "arm"; - float = "hard"; + config = "armv6l-unknown-linux-gnueabi"; + bigEndian = false; + arch = "arm"; + float = "hard"; + fpu = "vfp"; + withTLS = true; + libc = "glibc"; + platform = pkgsNoParams.platforms.raspberrypi; + openssl.system = "linux-generic32"; + gcc = { + arch = "armv6"; fpu = "vfp"; - withTLS = true; - libc = "glibc"; - platform = pkgsNoParams.platforms.raspberrypi; - openssl.system = "linux-generic32"; - gcc = { - arch = "armv6"; - fpu = "vfp"; - float = "hard"; - }; + float = "hard"; + }; }; }; raspberrypiCrossSystemUclibc = { crossSystem = { - config = "armv6l-unknown-linux-gnueabi"; - bigEndian = false; - arch = "arm"; - float = "hard"; + config = "armv6l-unknown-linux-gnueabi"; + bigEndian = false; + arch = "arm"; + float = "hard"; + fpu = "vfp"; + withTLS = true; + libc = "uclibc"; + platform = pkgsNoParams.platforms.raspberrypi; + openssl.system = "linux-generic32"; + gcc = { + arch = "armv6"; fpu = "vfp"; - withTLS = true; - libc = "uclibc"; - platform = pkgsNoParams.platforms.raspberrypi; - openssl.system = "linux-generic32"; - gcc = { - arch = "armv6"; - fpu = "vfp"; - float = "hard"; - }; - uclibc.extraConfig = '' - ARCH_WANTS_BIG_ENDIAN n - ARCH_BIG_ENDIAN n - ARCH_WANTS_LITTLE_ENDIAN y - ARCH_LITTLE_ENDIAN y - ''; + float = "hard"; + }; + uclibc.extraConfig = '' + ARCH_WANTS_BIG_ENDIAN n + ARCH_BIG_ENDIAN n + ARCH_WANTS_LITTLE_ENDIAN y + ARCH_LITTLE_ENDIAN y + ''; }; }; |