From 33d3cf2d1c86fa537d0c563668db9d99f331f299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 28 Dec 2012 16:39:54 +0000 Subject: [PATCH] Fixes in make-bootstrap-tools-crosspi.nix It doesn't reference anymore. And I fixed the indentation. --- .../linux/make-bootstrap-tools-crosspi.nix | 66 +++++++++---------- 1 file 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 ; # 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 + ''; }; };