public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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).

svn path=/nixpkgs/branches/stdenv-updates/; revision=30069
This commit is contained in:
Eelco Dolstra 2011-10-27 18:42:32 +00:00
parent 30933c30d3
commit 4d0d7d78c5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/glibc-2.13/common.nix
View File

@ -90,6 +90,7 @@ stdenv.mkDerivation ({
configureFlags = [ configureFlags = [
"-C" "-C"
"--enable-add-ons" "--enable-add-ons"
"--sysconfdir=/etc"
"--localedir=/var/run/current-system/sw/lib/locale" "--localedir=/var/run/current-system/sw/lib/locale"
(if kernelHeaders != null (if kernelHeaders != null
then "--with-headers=${kernelHeaders}/include" then "--with-headers=${kernelHeaders}/include"
@ -112,6 +113,8 @@ stdenv.mkDerivation ({
"libc_cv_as_needed=no" "libc_cv_as_needed=no"
]; ];
installFlags = [ "sysconfdir=$(out)/etc" ];
buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
++ stdenv.lib.optional (mig != null) mig; ++ stdenv.lib.optional (mig != null) mig;

3
pkgs/development/libraries/glibc-2.14/common.nix
View File

@ -90,6 +90,7 @@ stdenv.mkDerivation ({
configureFlags = [ configureFlags = [
"-C" "-C"
"--enable-add-ons" "--enable-add-ons"
"--sysconfdir=/etc"
"--localedir=/var/run/current-system/sw/lib/locale" "--localedir=/var/run/current-system/sw/lib/locale"
(if kernelHeaders != null (if kernelHeaders != null
then "--with-headers=${kernelHeaders}/include" then "--with-headers=${kernelHeaders}/include"
@ -112,6 +113,8 @@ stdenv.mkDerivation ({
"libc_cv_as_needed=no" "libc_cv_as_needed=no"
]; ];
installFlags = [ "sysconfdir=$(out)/etc" ];
buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ] buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
++ stdenv.lib.optional (mig != null) mig; ++ stdenv.lib.optional (mig != null) mig;