branch master updated: system: default-skeletons: Merge search-paths of multiple profiles.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

iyzsong pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 40310efde9 system: default-skeletons: Merge search-paths of multiple 
profiles.
40310efde9 is described below

commit 40310efde9b4a4f2cf98081d6cd10f843685ebb6
Author: 宋文武 <iyzsong@member.fsf.org>
AuthorDate: Wed Feb 8 10:37:35 2023 +0800

    system: default-skeletons: Merge search-paths of multiple profiles.
    
    Fixes <https://issues.guix.gnu.org/20255>.
    
    * gnu/system/shadow.scm (default-skeletons)[bash_profile, zprofile]:
    Merge search-paths from multiple profiles via "guix package".
---
 gnu/system/shadow.scm | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index 2bd72d3e96..8d428bf743 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -155,11 +155,31 @@ alias grep='grep --color=auto'\n"))
 if [ -f ~/.profile ]; then . ~/.profile; fi
 
 # Honor per-interactive-shell startup file
-if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n"))
+if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
+
+# Merge search-paths from multiple profiles, the order matters.
+eval \"$(guix package --search-paths \\
+-p $HOME/.config/guix/current \\
+-p $HOME/.guix-profile \\
+-p /run/current-system/profile)\"
+
+# Prepend setuid programs.
+export PATH=/run/setuid-programs:$PATH
+"))
         (bashrc  %default-bashrc)
         (zprofile    (plain-file "zprofile" "\
 # Honor system-wide environment variables
-source /etc/profile\n"))
+source /etc/profile
+
+# Merge search-paths from multiple profiles, the order matters.
+eval \"$(guix package --search-paths \\
+-p $HOME/.config/guix/current \\
+-p $HOME/.guix-profile \\
+-p /run/current-system/profile)\"
+
+# Prepend setuid programs.
+export PATH=/run/setuid-programs:$PATH
+"))
         (xdefaults (plain-file "Xdefaults" "\
 XTerm*utf8: always
 XTerm*metaSendsEscape: true\n"))