nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

session-init: add support for nix 2.4

Browse source 
See https://github.com/NixOS/nixpkgs/issues/149791.
This commit is contained in:
Tobias Happ 2021-12-10 21:00:58 +01:00 • committed by Alexander Sosedkin
parent 43fafe1736
commit 7b9ba13632
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/environment/session-init.nix
View file

@ -21,9 +21,11 @@ let
. $HOME/.nix-profile/etc/profile.d/nix.sh . $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) '' ${optionalString (config.home-manager.config != null) ''
if [ -e "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ]; then 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 set +u
. "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
set -u set -u