From 2a0344bb3922a0c439ad97c26a4ff3de352d9d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 1 Dec 2009 21:44:41 +0000 Subject: [PATCH] I forgot about updating the glibc locales expressions for glibc 2.10 and 2.11. I also set the 'glibcLocales' top-level attribute point to 2.11 instead of 2.10, to match that of the 'glibc' top-level attribute. svn path=/nixpkgs/branches/stdenv-updates/; revision=18746 --- pkgs/development/libraries/glibc-2.10/locales.nix | 2 +- pkgs/development/libraries/glibc-2.11/locales.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/glibc-2.10/locales.nix b/pkgs/development/libraries/glibc-2.10/locales.nix index 64e6bd43a67..61bfc9edc02 100644 --- a/pkgs/development/libraries/glibc-2.10/locales.nix +++ b/pkgs/development/libraries/glibc-2.10/locales.nix @@ -10,7 +10,7 @@ let build = import ./common.nix; in - build { + build null { name = "glibc-locales"; inherit fetchurl stdenv; diff --git a/pkgs/development/libraries/glibc-2.11/locales.nix b/pkgs/development/libraries/glibc-2.11/locales.nix index 64e6bd43a67..61bfc9edc02 100644 --- a/pkgs/development/libraries/glibc-2.11/locales.nix +++ b/pkgs/development/libraries/glibc-2.11/locales.nix @@ -10,7 +10,7 @@ let build = import ./common.nix; in - build { + build null { name = "glibc-locales"; inherit fetchurl stdenv; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 215d96c92a8..9e539af86e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3484,7 +3484,7 @@ let installLocales = getPkgConfig "glibc" "locales" false; }; - glibcLocales = makeOverridable (import ../development/libraries/glibc-2.10/locales.nix) { + glibcLocales = makeOverridable (import ../development/libraries/glibc-2.11/locales.nix) { inherit fetchurl stdenv; };