From: iyzsong--- via Bug reports for GNU Guix <bug-guix@gnu.org>
To: 20255@debbugs.gnu.org
Cc: 宋文武 <iyzsong@member.fsf.org>
Subject: bug#20255: [PATCH 3/4] system: Only source system profile's settings in '/etc/profile'.
Date: Wed, 17 May 2023 22:04:10 +0800 [thread overview]
Message-ID: <2e888b4d07c67ad74fbb4ec9afb812a236852027.1684331588.git.iyzsong@member.fsf.org> (raw)
In-Reply-To: <10665650174637a1b70629b864509a0a68920154.1684331588.git.iyzsong@member.fsf.org>
From: 宋文武 <iyzsong@member.fsf.org>
This is a followup to 40310efde9b4a4f2cf98081d6cd10f843685ebb6.
* gnu/system.scm (operating-system-etc-service)[profile]:
Don't source profile of '~/.guix-profile' and '~/.config/guix/current'.
---
gnu/system.scm | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 354f58f55b..a48c206e18 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1009,8 +1009,8 @@ (define* (operating-system-etc-service os)
;; environment variables.
(profile (mixed-text-file "profile" "\
# Crucial variables that could be missing in the profiles' 'etc/profile'
-# because they would require combining both profiles.
-# FIXME: See <http://bugs.gnu.org/20255>.
+# because they would require honoring search paths of dependencies.
+# FIXME: See <http://bugs.gnu.org/22138>.
export MANPATH=$HOME/.guix-profile/share/man:/run/current-system/profile/share/man
export INFOPATH=$HOME/.guix-profile/share/info:/run/current-system/profile/share/info
export XDG_DATA_DIRS=$HOME/.guix-profile/share:/run/current-system/profile/share
@@ -1037,27 +1037,12 @@ (define* (operating-system-etc-service os)
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\"
-do
- if [ -f \"$profile/etc/profile\" ]
- then
- # Load the user profile's settings.
- GUIX_PROFILE=\"$profile\" ; \\
- . \"$profile/etc/profile\"
- else
- # At least define this one so that basic things just work
- # when the user installs their first package.
- export PATH=\"$profile/bin:$PATH\"
- fi
-done
+# Make basic things just work when the user installs their first package.
+export PATH=\"$HOME/.config/guix/current/bin:$HOME/.guix-profile/bin:$PATH\"
# Prepend setuid programs.
export PATH=/run/setuid-programs:$PATH
-# Arrange so that ~/.config/guix/current/share/info comes first.
-export INFOPATH=\"$HOME/.config/guix/current/share/info:$INFOPATH\"
-
# Set the umask, notably for users logging in via 'lsh'.
# See <http://bugs.gnu.org/22650>.
umask 022
--
2.40.1
next prev parent reply other threads:[~2023-05-17 14:05 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-04 10:29 bug#20255: 'search-paths' should respect both user and system profile 宋文武
2015-04-04 21:04 ` Ludovic Courtès
2015-04-05 3:39 ` 宋文武
2015-04-05 18:15 ` Ludovic Courtès
2015-04-06 4:02 ` 宋文武
2015-04-06 8:24 ` Mark H Weaver
2015-05-02 22:12 ` Ludovic Courtès
2015-11-19 22:32 ` Ludovic Courtès
2015-11-20 22:42 ` Alex Kost
2015-11-21 8:57 ` Ludovic Courtès
2015-11-21 18:41 ` Alex Kost
2015-11-21 20:10 ` Ludovic Courtès
2015-11-22 7:52 ` Alex Kost
2015-11-22 10:52 ` Ludovic Courtès
2015-11-22 18:44 ` Alex Kost
2015-11-22 23:04 ` Ludovic Courtès
2015-11-23 11:55 ` Alex Kost
2015-11-23 14:31 ` Ludovic Courtès
2015-11-24 17:22 ` Ludovic Courtès
2015-11-30 9:08 ` Alex Kost
2015-11-30 12:25 ` Ludovic Courtès
2015-05-04 21:44 ` Ludovic Courtès
2015-05-05 8:28 ` 宋文武
2015-05-05 12:35 ` Ludovic Courtès
2015-05-06 16:35 ` Ludovic Courtès
2015-11-12 11:13 ` Ludovic Courtès
2020-02-21 15:53 ` bug#20255: (old)bug#20255: 'search-paths' should respect both user and system profiles zimoun
2020-02-21 17:18 ` Alex Kost
2021-06-26 2:37 ` bug#20255: 'search-paths' should respect both user and system profile Maxim Cournoyer
2021-06-26 5:59 ` Leo Prikler
2021-06-28 4:35 ` Maxim Cournoyer
2021-06-28 6:58 ` Leo Prikler
2021-06-27 9:59 ` Alex Kost
2021-06-28 4:48 ` Maxim Cournoyer
2021-06-29 17:29 ` Alex Kost
2020-12-18 20:27 ` bug#20255: «the Oldest» [PATCH] 'search-paths' should respect both user and system profiles zimoun
2023-05-12 12:34 ` bug#20255: 'search-paths' should respect both user and system profile 宋文武 via Bug reports for GNU Guix
2023-05-15 13:53 ` Maxim Cournoyer
2023-05-15 17:14 ` Josselin Poiret via Bug reports for GNU Guix
2023-05-15 17:46 ` Maxim Cournoyer
2023-05-16 9:37 ` Josselin Poiret via Bug reports for GNU Guix
2023-05-16 11:00 ` 宋文武 via Bug reports for GNU Guix
2023-05-17 14:04 ` bug#20255: [PATCH 1/4] home: shells: Merge search-paths of multiple profiles iyzsong--- via Bug reports for GNU Guix
2023-05-17 14:04 ` bug#20255: [PATCH 2/4] system: default-skeletons: Set up Guix home profile when it exists iyzsong--- via Bug reports for GNU Guix
2023-05-17 14:04 ` iyzsong--- via Bug reports for GNU Guix [this message]
2023-05-17 14:04 ` bug#20255: [PATCH 4/4] news: Add entry for '/etc/profile' changes iyzsong--- via Bug reports for GNU Guix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2e888b4d07c67ad74fbb4ec9afb812a236852027.1684331588.git.iyzsong@member.fsf.org \
--to=bug-guix@gnu.org \
--cc=20255@debbugs.gnu.org \
--cc=iyzsong@envs.net \
--cc=iyzsong@member.fsf.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).