Bringing back glibc213Cross

Issue #594. I don't know what triggred this glibc213Cross problem though.
I don't know why it disappeared, and I don't know why we have glibc213
there still.
This commit is contained in:
Lluís Batlle i Rossell 2013-06-05 22:59:00 +02:00
parent b6f7f05b35
commit a72ca55dd8

View File

@ -3865,6 +3865,19 @@ let
gccCross = null; gccCross = null;
}) // (if crossSystem != null then { crossDrv = glibc213Cross; } else {}); }) // (if crossSystem != null then { crossDrv = glibc213Cross; } else {});
glibc213Cross = forceNativeDrv (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 = config.glibc.locales or false;
}
// lib.optionalAttrs crossGNU {
inherit (gnu) machHeaders hurdHeaders libpthreadHeaders mig;
inherit fetchgit;
}));
glibc217 = callPackage ../development/libraries/glibc/2.17 { glibc217 = callPackage ../development/libraries/glibc/2.17 {
kernelHeaders = linuxHeaders; kernelHeaders = linuxHeaders;
installLocales = config.glibc.locales or false; installLocales = config.glibc.locales or false;