Author: viric
Date: Tue Oct 12 20:41:40 2010
New Revision: 24249
URL: https://svn.nixos.org/websvn/nix/?rev=24249&sc=1
Log:
The glibc locales expression did not work limiting SUPPORTED-LOCALES. Now it
does.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales.nix
Tue Oct 12 20:12:10 2010 (r24248)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales.nix
Tue Oct 12 20:41:40 2010 (r24249)
@@ -28,12 +28,13 @@
mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p
localedef)))/../lib/locale"
# Hack to allow building of the locales (needed since glibc-2.12)
- sed -i -e 's/^LOCALEDEF=/LOCALEDEF?=/' ../glibc-2*/localedata/Makefile
+ sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \
+ /library-path/d ../glibc-2*/localedata/Makefile
+ ${if allLocales then "" else
+ "echo SUPPORTED-LOCALES=\"${toString locales}\" >
../glibc-2*/localedata/SUPPORTED"}
make localedata/install-locales \
- LOCALEDEF="localedef --prefix=$TMPDIR" \
localedir=$out/lib/locale \
- ${if allLocales then "" else "SUPPORTED-LOCALES=\"${toString
locales}\""}
'';
installPhase =
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
