public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set $LOCALE_ARCHIVE in all systemd units

Browse Source 
This variable used to be inherited implicitly from the stage-2 script,
but systemd now clears the environment. So we need to set it
explicitly.
This commit is contained in:
Eelco Dolstra 2014-04-18 19:03:50 +02:00
parent 313c38d5f1
commit 465d6ff572
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/config/i18n.nix
View File

@ -76,7 +76,12 @@ in
environment.systemPackages = [ glibcLocales ]; environment.systemPackages = [ glibcLocales ];
environment.variables.LANG = config.i18n.defaultLocale; environment.variables =
{ LANG = config.i18n.defaultLocale;
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
};
systemd.globalEnvironment.LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
# ‘/etc/locale.conf’ is used by systemd. # ‘/etc/locale.conf’ is used by systemd.
environment.etc = singleton environment.etc = singleton

3
nixos/modules/programs/environment.nix
View File

@ -17,8 +17,7 @@ in
config = { config = {
environment.variables = environment.variables =
{ LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive"; { LOCATE_PATH = "/var/cache/locatedb";
LOCATE_PATH = "/var/cache/locatedb";
NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix"; NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
NIX_PATH = NIX_PATH =
[ "/nix/var/nix/profiles/per-user/root/channels/nixos" [ "/nix/var/nix/profiles/per-user/root/channels/nixos"

1
nixos/modules/services/networking/ssh/sshd.nix
View File

@ -258,7 +258,6 @@ in
path = [ pkgs.openssh pkgs.gawk ]; path = [ pkgs.openssh pkgs.gawk ];
environment.LD_LIBRARY_PATH = nssModulesPath; environment.LD_LIBRARY_PATH = nssModulesPath;
environment.LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
preStart = preStart =
'' ''