From 2b6017dd0b031e43de7e66b3e1f3f331c0ab712c Mon Sep 17 00:00:00 2001
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 22 Apr 2023 09:58:48 +0200
Subject: [PATCH] gnu: system: Cater for Guix Home in PATH.

In <https://issues.guix.gnu.org/63009> it was promised to be pushed to master,
but that didn't seem to have happened.  This resolves that promise.

* gnu/system.scm (operating-system-etc-service): Also add a user's
<guix-home>/profile/bin directory to PATH, before <guix-profile>/bin.

Change-Id: Ibd2866153a211585c4981293027544557f8fa06c
---
 gnu/system.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 8df871f2552..0d98e5a0362 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1089,8 +1089,11 @@ then
   export `cat /etc/environment | cut -d= -f1`
 fi
 
-# Arrange so that ~/.config/guix/current comes first.
-for profile in \"$HOME/.guix-profile\" \"$HOME/.config/guix/current\"
+# Arrange so that ~/.config/guix/current comes first,
+# and guix-home comes before guix-profile.
+for profile in \"$HOME/.guix-profile\"        \\
+               \"$HOME/.guix-home/profile\"   \\
+               \"$HOME/.config/guix/current\"
 do
   if [ -f \"$profile/etc/profile\" ]
   then