diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0413a0af217..18cd0c90651 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1784,7 +1784,7 @@ let gcc43_realCross = cross : makeOverridable (import ../development/compilers/gcc-4.3) { inherit stdenv fetchurl texinfo gmp mpfr noSysDirs cross; binutilsCross = binutilsCross cross; - glibcCross = glibcCross cross; + glibcCross = libcCross cross; profiledCompiler = false; enableMultilib = true; crossStageStatic = false; @@ -1794,7 +1794,7 @@ let inherit stdenv fetchurl texinfo gmp mpfr ppl cloogppl noSysDirs cross gettext which; binutilsCross = binutilsCross cross; - glibcCross = glibcCross cross; + glibcCross = libcCross cross; profiledCompiler = false; enableMultilib = true; crossStageStatic = false; @@ -1813,7 +1813,7 @@ let gccCrossStageFinal = cross: wrapGCCCross { gcc = forceBuildDrv (gcc43_realCross cross); - libc = glibcCross cross; + libc = libcCross cross; binutils = binutilsCross cross; inherit cross; }; @@ -3483,7 +3483,9 @@ let installLocales = getPkgConfig "glibc" "locales" false; }); - glibcCross = cross: glibc211Cross cross; + # We can choose: + # glibcCross = cross: glibc211Cross cross; + libcCross = cross: uclibcCross cross; eglibc = import ../development/libraries/eglibc { inherit fetchsvn stdenv kernelHeaders; @@ -6029,6 +6031,12 @@ let inherit fetchurl stdenv kernelHeaders; }; + uclibcCross = target: import ../os-specific/linux/uclibc { + inherit fetchurl stdenv; + kernelHeaders = kernelHeadersCross target; + gccCross = gccCrossStageStatic target; + }; + udev = makeOverridable (import ../os-specific/linux/udev) { inherit fetchurl stdenv gperf pkgconfig acl libusb usbutils pciutils glib; }; |