eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-12-27 12:19:48 +01:00
Code Issues Releases Wiki Activity

generic-linux: respect NIX_STATE_DIR

Browse source
This commit is contained in:
Robert Helgesson 2020-06-14 23:34:53 +02:00
parent dc227b579d
commit ecb93ab9ae
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/targets/generic-linux.nix
View file

@ -16,7 +16,8 @@ in {
config = mkIf config.targets.genericLinux.enable {
home.sessionVariables = let
profiles = [ "/nix/var/nix/profiles/default" profileDirectory ];
profiles =
[ "\${NIX_STATE_DIR:-/nix/var/nix}/profiles/default" profileDirectory ];
dataDirs =
concatStringsSep ":" (map (profile: "${profile}/share") profiles);
in { XDG_DATA_DIRS = "${dataDirs}\${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS"; };

2
tests/modules/targets/generic-linux.nix
View file

@ -10,7 +10,7 @@ with lib;
assertFileExists home-path/etc/profile.d/hm-session-vars.sh
assertFileContains \
home-path/etc/profile.d/hm-session-vars.sh \
'export XDG_DATA_DIRS="/nix/var/nix/profiles/default/share:/home/hm-user/.nix-profile/share''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS"'
'export XDG_DATA_DIRS="''${NIX_STATE_DIR:-/nix/var/nix}/profiles/default/share:/home/hm-user/.nix-profile/share''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS"'
assertFileContains \
home-path/etc/profile.d/hm-session-vars.sh \
'. "${pkgs.nix}/etc/profile.d/nix.sh"'