mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 09:02:46 +00:00
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
This commit is contained in:
parent
8910d4e646
commit
2a0344bb39
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
let build = import ./common.nix;
|
let build = import ./common.nix;
|
||||||
in
|
in
|
||||||
build {
|
build null {
|
||||||
name = "glibc-locales";
|
name = "glibc-locales";
|
||||||
|
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
let build = import ./common.nix;
|
let build = import ./common.nix;
|
||||||
in
|
in
|
||||||
build {
|
build null {
|
||||||
name = "glibc-locales";
|
name = "glibc-locales";
|
||||||
|
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv;
|
||||||
|
|
|
@ -3484,7 +3484,7 @@ let
|
||||||
installLocales = getPkgConfig "glibc" "locales" false;
|
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;
|
inherit fetchurl stdenv;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue