From ecb93ab9aeeb718e238114243d951a82f20ebf3f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 14 Jun 2020 23:34:53 +0200
Subject: [PATCH] generic-linux: respect NIX_STATE_DIR

---
 modules/targets/generic-linux.nix       | 3 ++-
 tests/modules/targets/generic-linux.nix | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/targets/generic-linux.nix b/modules/targets/generic-linux.nix
index cf63f6218..bdb27926f 100644
--- a/modules/targets/generic-linux.nix
+++ b/modules/targets/generic-linux.nix
@@ -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"; };
diff --git a/tests/modules/targets/generic-linux.nix b/tests/modules/targets/generic-linux.nix
index 8596ac3d9..d9bb85b65 100644
--- a/tests/modules/targets/generic-linux.nix
+++ b/tests/modules/targets/generic-linux.nix
@@ -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"'