From 0811db080e8ee73d1df01bef19fb6fb1613afe8b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 17 Feb 2012 22:02:37 +0000 Subject: [PATCH] * Move all glibc versions to development/libraries/glibc. svn path=/nixpkgs/branches/stdenv-updates/; revision=32373 --- .../{glibc-2.13 => glibc/2.13}/builder.sh | 0 .../{glibc-2.13 => glibc/2.13}/common.nix | 0 .../{glibc-2.13 => glibc/2.13}/default.nix | 0 .../2.13}/glibc-elf-localscope.patch | 0 .../{glibc-2.13 => glibc/2.13}/info.nix | 0 .../2.13}/locales-builder.sh | 0 .../{glibc-2.13 => glibc/2.13}/locales.nix | 0 .../2.13}/nix-locale-archive.patch | 0 .../2.13}/nss-skip-unavail.patch | 0 .../2.13}/rpcgen-path.patch | 0 .../{glibc-2.14 => glibc/2.14}/builder.sh | 0 .../{glibc-2.14 => glibc/2.14}/common.nix | 0 .../{glibc-2.14 => glibc/2.14}/default.nix | 0 .../2.14}/glibc-elf-localscope.patch | 0 .../{glibc-2.14 => glibc/2.14}/info.nix | 0 .../2.14}/locales-builder.sh | 0 .../{glibc-2.14 => glibc/2.14}/locales.nix | 0 .../2.14}/nix-locale-archive.patch | 0 .../2.14}/nss-skip-unavail.patch | 0 .../2.14}/rpcgen-path.patch | 0 .../2.5}/binutils-ld.patch | 0 .../{glibc-2.5 => glibc/2.5}/builder.sh | 0 .../{glibc-2.5 => glibc/2.5}/default.nix | 0 .../2.5}/glibc-getcwd-param-MAX.patch | 0 .../2.5}/glibc-inline.patch | 0 .../{glibc-2.5 => glibc/2.5}/glibc-pwd.patch | 0 .../2.5}/make-3-82-fix.patch | 0 .../{glibc-2.5 => glibc/2.5}/x86-fnstsw.patch | 0 .../{glibc-2.7 => glibc/2.7}/builder.sh | 0 .../{glibc-2.7 => glibc/2.7}/default.nix | 0 .../2.7}/nss-skip-unavail.patch | 0 .../2.9}/binutils-2.20.patch | 0 .../2.9}/binutils-ld.patch | 0 .../{glibc-2.9 => glibc/2.9}/builder.sh | 0 .../{glibc-2.9 => glibc/2.9}/default.nix | 0 .../{glibc-2.9 => glibc/2.9}/headers.nix | 0 .../2.9}/headersbuilder.sh | 0 .../{glibc-2.9 => glibc/2.9}/info.nix | 0 .../2.9}/locale-override.patch | 0 .../{glibc-2.9 => glibc/2.9}/locales.nix | 0 .../2.9}/localesbuilder.sh | 0 .../2.9}/nss-skip-unavail.patch | 0 .../2.9}/rpcgen-path.patch | 0 pkgs/top-level/all-packages.nix | 46 ++++++++----------- 44 files changed, 18 insertions(+), 28 deletions(-) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/common.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/glibc-elf-localscope.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/locales-builder.sh (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.13 => glibc/2.13}/rpcgen-path.patch (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/common.nix (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/glibc-elf-localscope.patch (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/locales-builder.sh (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.14 => glibc/2.14}/rpcgen-path.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/binutils-ld.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/glibc-getcwd-param-MAX.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/glibc-inline.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/glibc-pwd.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/make-3-82-fix.patch (100%) rename pkgs/development/libraries/{glibc-2.5 => glibc/2.5}/x86-fnstsw.patch (100%) rename pkgs/development/libraries/{glibc-2.7 => glibc/2.7}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.7 => glibc/2.7}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.7 => glibc/2.7}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/binutils-2.20.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/binutils-ld.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/builder.sh (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/default.nix (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/headers.nix (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/headersbuilder.sh (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/info.nix (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/locale-override.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/locales.nix (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/localesbuilder.sh (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/nss-skip-unavail.patch (100%) rename pkgs/development/libraries/{glibc-2.9 => glibc/2.9}/rpcgen-path.patch (100%) diff --git a/pkgs/development/libraries/glibc-2.13/builder.sh b/pkgs/development/libraries/glibc/2.13/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.13/builder.sh rename to pkgs/development/libraries/glibc/2.13/builder.sh diff --git a/pkgs/development/libraries/glibc-2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/common.nix rename to pkgs/development/libraries/glibc/2.13/common.nix diff --git a/pkgs/development/libraries/glibc-2.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/default.nix rename to pkgs/development/libraries/glibc/2.13/default.nix diff --git a/pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.13/glibc-elf-localscope.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/glibc-elf-localscope.patch rename to pkgs/development/libraries/glibc/2.13/glibc-elf-localscope.patch diff --git a/pkgs/development/libraries/glibc-2.13/info.nix b/pkgs/development/libraries/glibc/2.13/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/info.nix rename to pkgs/development/libraries/glibc/2.13/info.nix diff --git a/pkgs/development/libraries/glibc-2.13/locales-builder.sh b/pkgs/development/libraries/glibc/2.13/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.13/locales-builder.sh rename to pkgs/development/libraries/glibc/2.13/locales-builder.sh diff --git a/pkgs/development/libraries/glibc-2.13/locales.nix b/pkgs/development/libraries/glibc/2.13/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.13/locales.nix rename to pkgs/development/libraries/glibc/2.13/locales.nix diff --git a/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.13/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch rename to pkgs/development/libraries/glibc/2.13/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.13/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc/2.13/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.13/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.13/rpcgen-path.patch rename to pkgs/development/libraries/glibc/2.13/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc-2.14/builder.sh b/pkgs/development/libraries/glibc/2.14/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.14/builder.sh rename to pkgs/development/libraries/glibc/2.14/builder.sh diff --git a/pkgs/development/libraries/glibc-2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.14/common.nix rename to pkgs/development/libraries/glibc/2.14/common.nix diff --git a/pkgs/development/libraries/glibc-2.14/default.nix b/pkgs/development/libraries/glibc/2.14/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.14/default.nix rename to pkgs/development/libraries/glibc/2.14/default.nix diff --git a/pkgs/development/libraries/glibc-2.14/glibc-elf-localscope.patch b/pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.14/glibc-elf-localscope.patch rename to pkgs/development/libraries/glibc/2.14/glibc-elf-localscope.patch diff --git a/pkgs/development/libraries/glibc-2.14/info.nix b/pkgs/development/libraries/glibc/2.14/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.14/info.nix rename to pkgs/development/libraries/glibc/2.14/info.nix diff --git a/pkgs/development/libraries/glibc-2.14/locales-builder.sh b/pkgs/development/libraries/glibc/2.14/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.14/locales-builder.sh rename to pkgs/development/libraries/glibc/2.14/locales-builder.sh diff --git a/pkgs/development/libraries/glibc-2.14/locales.nix b/pkgs/development/libraries/glibc/2.14/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.14/locales.nix rename to pkgs/development/libraries/glibc/2.14/locales.nix diff --git a/pkgs/development/libraries/glibc-2.14/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.14/nix-locale-archive.patch rename to pkgs/development/libraries/glibc/2.14/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc-2.14/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.14/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc/2.14/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.14/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.14/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.14/rpcgen-path.patch rename to pkgs/development/libraries/glibc/2.14/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc-2.5/binutils-ld.patch b/pkgs/development/libraries/glibc/2.5/binutils-ld.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/binutils-ld.patch rename to pkgs/development/libraries/glibc/2.5/binutils-ld.patch diff --git a/pkgs/development/libraries/glibc-2.5/builder.sh b/pkgs/development/libraries/glibc/2.5/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.5/builder.sh rename to pkgs/development/libraries/glibc/2.5/builder.sh diff --git a/pkgs/development/libraries/glibc-2.5/default.nix b/pkgs/development/libraries/glibc/2.5/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.5/default.nix rename to pkgs/development/libraries/glibc/2.5/default.nix diff --git a/pkgs/development/libraries/glibc-2.5/glibc-getcwd-param-MAX.patch b/pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/glibc-getcwd-param-MAX.patch rename to pkgs/development/libraries/glibc/2.5/glibc-getcwd-param-MAX.patch diff --git a/pkgs/development/libraries/glibc-2.5/glibc-inline.patch b/pkgs/development/libraries/glibc/2.5/glibc-inline.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/glibc-inline.patch rename to pkgs/development/libraries/glibc/2.5/glibc-inline.patch diff --git a/pkgs/development/libraries/glibc-2.5/glibc-pwd.patch b/pkgs/development/libraries/glibc/2.5/glibc-pwd.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/glibc-pwd.patch rename to pkgs/development/libraries/glibc/2.5/glibc-pwd.patch diff --git a/pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch b/pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/make-3-82-fix.patch rename to pkgs/development/libraries/glibc/2.5/make-3-82-fix.patch diff --git a/pkgs/development/libraries/glibc-2.5/x86-fnstsw.patch b/pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.5/x86-fnstsw.patch rename to pkgs/development/libraries/glibc/2.5/x86-fnstsw.patch diff --git a/pkgs/development/libraries/glibc-2.7/builder.sh b/pkgs/development/libraries/glibc/2.7/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.7/builder.sh rename to pkgs/development/libraries/glibc/2.7/builder.sh diff --git a/pkgs/development/libraries/glibc-2.7/default.nix b/pkgs/development/libraries/glibc/2.7/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.7/default.nix rename to pkgs/development/libraries/glibc/2.7/default.nix diff --git a/pkgs/development/libraries/glibc-2.7/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.7/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc/2.7/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.9/binutils-2.20.patch b/pkgs/development/libraries/glibc/2.9/binutils-2.20.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/binutils-2.20.patch rename to pkgs/development/libraries/glibc/2.9/binutils-2.20.patch diff --git a/pkgs/development/libraries/glibc-2.9/binutils-ld.patch b/pkgs/development/libraries/glibc/2.9/binutils-ld.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/binutils-ld.patch rename to pkgs/development/libraries/glibc/2.9/binutils-ld.patch diff --git a/pkgs/development/libraries/glibc-2.9/builder.sh b/pkgs/development/libraries/glibc/2.9/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.9/builder.sh rename to pkgs/development/libraries/glibc/2.9/builder.sh diff --git a/pkgs/development/libraries/glibc-2.9/default.nix b/pkgs/development/libraries/glibc/2.9/default.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.9/default.nix rename to pkgs/development/libraries/glibc/2.9/default.nix diff --git a/pkgs/development/libraries/glibc-2.9/headers.nix b/pkgs/development/libraries/glibc/2.9/headers.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.9/headers.nix rename to pkgs/development/libraries/glibc/2.9/headers.nix diff --git a/pkgs/development/libraries/glibc-2.9/headersbuilder.sh b/pkgs/development/libraries/glibc/2.9/headersbuilder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.9/headersbuilder.sh rename to pkgs/development/libraries/glibc/2.9/headersbuilder.sh diff --git a/pkgs/development/libraries/glibc-2.9/info.nix b/pkgs/development/libraries/glibc/2.9/info.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.9/info.nix rename to pkgs/development/libraries/glibc/2.9/info.nix diff --git a/pkgs/development/libraries/glibc-2.9/locale-override.patch b/pkgs/development/libraries/glibc/2.9/locale-override.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/locale-override.patch rename to pkgs/development/libraries/glibc/2.9/locale-override.patch diff --git a/pkgs/development/libraries/glibc-2.9/locales.nix b/pkgs/development/libraries/glibc/2.9/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc-2.9/locales.nix rename to pkgs/development/libraries/glibc/2.9/locales.nix diff --git a/pkgs/development/libraries/glibc-2.9/localesbuilder.sh b/pkgs/development/libraries/glibc/2.9/localesbuilder.sh similarity index 100% rename from pkgs/development/libraries/glibc-2.9/localesbuilder.sh rename to pkgs/development/libraries/glibc/2.9/localesbuilder.sh diff --git a/pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/nss-skip-unavail.patch rename to pkgs/development/libraries/glibc/2.9/nss-skip-unavail.patch diff --git a/pkgs/development/libraries/glibc-2.9/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.9/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc-2.9/rpcgen-path.patch rename to pkgs/development/libraries/glibc/2.9/rpcgen-path.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38501c18e7c4..58812453961c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3515,29 +3515,29 @@ let glibcCross = glibc214Cross; - glibc25 = callPackage ../development/libraries/glibc-2.5 { + glibc25 = callPackage ../development/libraries/glibc/2.5 { kernelHeaders = linuxHeaders_2_6_28; installLocales = false; }; - glibc27 = callPackage ../development/libraries/glibc-2.7 { + glibc27 = callPackage ../development/libraries/glibc/2.7 { kernelHeaders = linuxHeaders; #installLocales = false; }; - glibc29 = callPackage ../development/libraries/glibc-2.9 { + glibc29 = callPackage ../development/libraries/glibc/2.9 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; }; - glibc29Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.9) { + glibc29Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.9) { inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = linuxHeadersCross; installLocales = getConfig [ "glibc" "locales" ] false; }); - glibc213 = (callPackage ../development/libraries/glibc-2.13 { + glibc213 = (callPackage ../development/libraries/glibc/2.13 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; machHeaders = null; @@ -3545,49 +3545,39 @@ let gccCross = null; }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {}); - glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.13) - (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); - in ({ + glibc213Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.13) + (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; + in { inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; installLocales = getConfig [ "glibc" "locales" ] false; } - - // - - (if crossGNU - then { + // lib.optionalAttrs crossGNU { inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; inherit fetchgit; - } - else { })))); + })); - glibc214 = (callPackage ../development/libraries/glibc-2.14 { + glibc214 = (callPackage ../development/libraries/glibc/2.14 { kernelHeaders = linuxHeaders; installLocales = getConfig [ "glibc" "locales" ] false; machHeaders = null; hurdHeaders = null; gccCross = null; - }) // (if crossSystem != null then { hostDrv = glibc214Cross; } else {}); + }) // (lib.optionalAttrs (crossSystem != null) { hostDrv = glibc214Cross; }); - glibc214Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.14) + glibc214Cross = forceBuildDrv (makeOverridable (import ../development/libraries/glibc/2.14) (let crossGNU = (crossSystem != null && crossSystem.config == "i586-pc-gnu"); - in ({ + in { inherit stdenv fetchurl; gccCross = gccCrossStageStatic; kernelHeaders = if crossGNU then gnu.hurdHeaders else linuxHeadersCross; installLocales = getConfig [ "glibc" "locales" ] false; } - - // - - (if crossGNU - then { + // lib.optionalAttrs crossGNU { inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig; inherit fetchgit; - } - else { })))); + })); # We can choose: libcCrossChooser = name : if (name == "glibc") then glibcCross @@ -3602,9 +3592,9 @@ let installLocales = getConfig [ "glibc" "locales" ] false; }; - glibcLocales = callPackage ../development/libraries/glibc-2.14/locales.nix { }; + glibcLocales = callPackage ../development/libraries/glibc/2.14/locales.nix { }; - glibcInfo = callPackage ../development/libraries/glibc-2.14/info.nix { }; + glibcInfo = callPackage ../development/libraries/glibc/2.14/info.nix { }; glibc_multi = runCommand "${glibc.name}-multi"