* A function to build Glibc's locale-archive separately from Glibc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15155

pkgs/development/libraries/glibc-2.9/default.nix

@@ -40,6 +40,9 @@ stdenv.mkDerivation rec {
        does work because "status" will contain UNAVAIL after the
        failure to find mdns4_minimal. */
     ./nss-skip-unavail.patch
+
+    /* Make it possible to override the locale-archive in NixOS. */
+    # ./locale-override.patch
   ];
 
   # `--with-tls --without-__thread' enables support for TLS but causes

pkgs/development/libraries/glibc-2.9/locales.nix

@@ -0,0 +1,47 @@
+/* This function builds just the `lib/locale/locale-archive' file from
+   Glibc and nothing else.  If `allLocales' is true, all supported
+   locales are included; otherwise, just the locales listed in
+   `locales'.  See localedata/SUPPORTED in the Glibc source tree for
+   the list of all supported locales:
+   http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc
+*/
+
+{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }:
+
+stdenv.mkDerivation rec {
+  name = "glibc-locales-2.9";
+  
+  src = fetchurl {
+    url = http://nixos.org/tarballs/glibc-2.9-20081208.tar.bz2;
+    sha256 = "0zhxbgcsl97pf349m0lz8d5ljvvzrcqc23yf08d888xlk4ms8m3h";
+  };
+
+  configurePhase = "true";
+
+  # Awful hack: `localedef' doesn't allow the path to `locale-archive'
+  # to be overriden, but you *can* specify a prefix, i.e. it will use
+  # <prefix>/<path-to-glibc>/lib/locale/locale-archive.  So we use
+  # $TMPDIR as a prefix, meaning that the locale-archive is placed in
+  # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive.
+  buildPhase =
+    ''
+      touch config.make
+      touch config.status
+      mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale"
+      make localedata/install-locales \
+          LOCALEDEF="localedef --prefix=$TMPDIR" \
+          localedir=$out/lib/locale \
+          ${if allLocales then "" else "SUPPORTED-LOCALES=\"${toString locales}\""}
+    '';
+
+  installPhase =
+    ''
+      ensureDir $out/lib/locale
+      cp $TMPDIR/nix/store/*/lib/locale/locale-archive $out/lib/locale/
+    '';
+
+  meta = {
+    homepage = http://www.gnu.org/software/libc/;
+    description = "Locale information for the GNU C Library";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -3052,6 +3052,10 @@ let
     installLocales = getPkgConfig "glibc" "locales" true;
   };
 
+  glibcLocales = import ../development/libraries/glibc-2.9/locales.nix {
+    inherit fetchurl stdenv;
+  };
+
   glibc_multi =
     assert system == "x86_64-linux";
     runCommand "${glibc.name}-multi"