From 4d0d7d78c5f116c59cd2736d55a5928981be5dc7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 27 Oct 2011 18:42:32 +0000
Subject: [PATCH] =?UTF-8?q?*=20Build=20Glibc=20with=20sysconfdir=20set=20t?=
 =?UTF-8?q?o=20/etc.=20=20This=20causes=20it=20to=20look=20for=20=20=20?=
 =?UTF-8?q?=E2=80=98localtime=E2=80=99=20(the=20default=20time=20zone=20de?=
 =?UTF-8?q?finition)=20in=20/etc=20rather=20than=20=20=20$out/etc,=20allow?=
 =?UTF-8?q?ing=20us=20to=20override=20the=20time=20zone=20globally=20in=20?=
 =?UTF-8?q?NixOS.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Note that Glibc already looked in /etc for most other configuration
  files (e.g., /etc/hosts).

svn path=/nixpkgs/branches/stdenv-updates/; revision=30069
---
 pkgs/development/libraries/glibc-2.13/common.nix | 3 +++
 pkgs/development/libraries/glibc-2.14/common.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/glibc-2.13/common.nix b/pkgs/development/libraries/glibc-2.13/common.nix
index 15941c2a43b7..d63e7e99e480 100644
--- a/pkgs/development/libraries/glibc-2.13/common.nix
+++ b/pkgs/development/libraries/glibc-2.13/common.nix
@@ -90,6 +90,7 @@ stdenv.mkDerivation ({
   configureFlags = [
     "-C"
     "--enable-add-ons"
+    "--sysconfdir=/etc"
     "--localedir=/var/run/current-system/sw/lib/locale"
     (if kernelHeaders != null
      then "--with-headers=${kernelHeaders}/include"
@@ -111,6 +112,8 @@ stdenv.mkDerivation ({
     # so the glibc does not depend on its compiler store path
     "libc_cv_as_needed=no"
   ];
+
+  installFlags = [ "sysconfdir=$(out)/etc" ];
   
   buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
     ++ stdenv.lib.optional (mig != null) mig;
diff --git a/pkgs/development/libraries/glibc-2.14/common.nix b/pkgs/development/libraries/glibc-2.14/common.nix
index 87b808cda4b6..e24089fd1920 100644
--- a/pkgs/development/libraries/glibc-2.14/common.nix
+++ b/pkgs/development/libraries/glibc-2.14/common.nix
@@ -90,6 +90,7 @@ stdenv.mkDerivation ({
   configureFlags = [
     "-C"
     "--enable-add-ons"
+    "--sysconfdir=/etc"
     "--localedir=/var/run/current-system/sw/lib/locale"
     (if kernelHeaders != null
      then "--with-headers=${kernelHeaders}/include"
@@ -111,6 +112,8 @@ stdenv.mkDerivation ({
     # so the glibc does not depend on its compiler store path
     "libc_cv_as_needed=no"
   ];
+
+  installFlags = [ "sysconfdir=$(out)/etc" ];
   
   buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
     ++ stdenv.lib.optional (mig != null) mig;