diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2015-01-19 11:06:00 +0300 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2015-01-19 11:06:11 +0300 |
commit | c163baca3bf09af9431bc2c00a642282f5e64776 (patch) | |
tree | ac3d0d530cafdedc6c411eeeceab25019efdcae9 /pkgs/development/libraries/glibc | |
parent | f33979461dcd33d5f041f724a6db06f27b8e3f36 (diff) | |
download | nixlib-c163baca3bf09af9431bc2c00a642282f5e64776.tar nixlib-c163baca3bf09af9431bc2c00a642282f5e64776.tar.gz nixlib-c163baca3bf09af9431bc2c00a642282f5e64776.tar.bz2 nixlib-c163baca3bf09af9431bc2c00a642282f5e64776.tar.lz nixlib-c163baca3bf09af9431bc2c00a642282f5e64776.tar.xz nixlib-c163baca3bf09af9431bc2c00a642282f5e64776.tar.zst nixlib-c163baca3bf09af9431bc2c00a642282f5e64776.zip |
Clean up glibcLocales environment handling -- manual merge of patch by wmertens (except Haskell part)
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r-- | pkgs/development/libraries/glibc/locales.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 1dd15832f5b6..5d6e678bfe6d 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -6,7 +6,7 @@ http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc */ -{ stdenv, fetchurl, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: +{ stdenv, fetchurl, writeText, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }: let build = import ./common.nix; in @@ -43,5 +43,10 @@ build null { cp -v "$TMPDIR/$NIX_STORE/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; + setupHook = writeText "locales-setup-hook.sh" + '' + export LOCALE_ARCHIVE=@out@/lib/locale/locale-archive + ''; + meta.description = "Locale information for the GNU C Library"; } |