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

login-inner: source session-init on initial build

Browse source
This commit is contained in:
Tobias Happ 2020-01-08 19:52:11 +01:00 • committed by Alexander Sosedkin
parent ad7345897f
commit eb2f3bca34
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/environment/login/login-inner.nix
View file

@ -4,6 +4,11 @@
let let
inherit (customPkgs.packageInfo) cacert coreutils nix; 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 in
writeText "login-inner" '' 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 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" [ "$#" -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 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 set -u
''
}
${lib.optionalString config.build.initialBuild '' ${lib.optionalString config.build.initialBuild ''
if [ -e /etc/UNINTIALISED ]; then if [ -e /etc/UNINTIALISED ]; then