From eb2f3bca349cc00f95839dd795c7b676ea6999b8 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Wed, 8 Jan 2020 19:52:11 +0100
Subject: [PATCH] login-inner: source session-init on initial build

---
 modules/environment/login/login-inner.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix
index e3aa490..dbe1317 100644
--- a/modules/environment/login/login-inner.nix
+++ b/modules/environment/login/login-inner.nix
@@ -4,6 +4,11 @@
 
 let
   inherit (customPkgs.packageInfo) cacert coreutils nix;
+
+  sessionInitPackage =
+    if config.build.initialBuild
+    then config.build.sessionInit
+    else "/nix/var/nix/profiles/per-user/${config.user.userName}/profile";
 in
 
 writeText "login-inner" ''
@@ -16,12 +21,9 @@ writeText "login-inner" ''
   [ "$#" -gt 0 ] || echo "If nothing works, use the rescue shell and read ${config.build.installationDir}/usr/lib/login-inner"
   [ "$#" -gt 0 ] || echo "If it does not help, report bugs at https://github.com/t184256/nix-on-droid-bootstrap/issues"
 
-  ${lib.optionalString (! config.build.initialBuild) ''
   set +u
-  . "/nix/var/nix/profiles/per-user/$USER/profile/etc/profile.d/nix-on-droid-session-init.sh"
+  . "${sessionInitPackage}/etc/profile.d/nix-on-droid-session-init.sh"
   set -u
-  ''
-  }
 
   ${lib.optionalString config.build.initialBuild ''
     if [ -e /etc/UNINTIALISED ]; then