From 27ae94e5669ba40da89d8de55c6308eb978b8cbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 12 Oct 2010 20:41:40 +0000 Subject: [PATCH] The glibc locales expression did not work limiting SUPPORTED-LOCALES. Now it does. svn path=/nixpkgs/branches/stdenv-updates/; revision=24249 --- pkgs/development/libraries/glibc-2.12/locales.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.12/locales.nix b/pkgs/development/libraries/glibc-2.12/locales.nix index 38f3f0723848..d598e0e094dc 100644 --- a/pkgs/development/libraries/glibc-2.12/locales.nix +++ b/pkgs/development/libraries/glibc-2.12/locales.nix @@ -28,12 +28,13 @@ in 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 =