From a72ca55dd898147478260e3b1c0a49ac7e5a8c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 5 Jun 2013 22:59:00 +0200 Subject: [PATCH] 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. --- pkgs/top-level/all-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d300e8db91c..9aa09f4e963 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3865,6 +3865,19 @@ let gccCross = null; }) // (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 { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false;