From 7b9ba13632e0cfa27de1a792c1c945b329576b16 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Fri, 10 Dec 2021 21:00:58 +0100
Subject: [PATCH] session-init: add support for nix 2.4

See https://github.com/NixOS/nixpkgs/issues/149791.
---
 modules/environment/session-init.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/environment/session-init.nix b/modules/environment/session-init.nix
index 6050c82..9bdf66e 100644
--- a/modules/environment/session-init.nix
+++ b/modules/environment/session-init.nix
@@ -21,9 +21,11 @@ let
 
       . $HOME/.nix-profile/etc/profile.d/nix.sh
 
+      # workaround for nix 2.4, see https://github.com/NixOS/nixpkgs/issues/149791
+      export NIX_PATH=$HOME/.nix-defexpr/channels''${NIX_PATH:+:}$NIX_PATH
+
       ${optionalString (config.home-manager.config != null) ''
         if [ -e "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ]; then
-          export NIX_PATH=$HOME/.nix-defexpr/channels''${NIX_PATH:+:}$NIX_PATH
           set +u
           . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
           set -u