Author: eelco
Date: Thu Oct 27 18:42:32 2011
New Revision: 30069
URL: https://nixos.org/websvn/nix/?rev=30069&sc=1
Log:
* Build Glibc with sysconfdir set to /etc. This causes it to look for
‘localtime’ (the default time zone definition) in /etc rather than
$out/etc, allowing us to override the time zone globally in NixOS.
Note that Glibc already looked in /etc for most other configuration
files (e.g., /etc/hosts).
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.14/common.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
Thu Oct 27 18:06:54 2011 (r30068)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
Thu Oct 27 18:42:32 2011 (r30069)
@@ -90,6 +90,7 @@
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 @@
# 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;
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.14/common.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.14/common.nix
Thu Oct 27 18:06:54 2011 (r30068)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.14/common.nix
Thu Oct 27 18:42:32 2011 (r30069)
@@ -90,6 +90,7 @@
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 @@
# 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;
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
