GNU bug report logs - #76082
[PATCH 0/9] Improve profile initialization on foreign distros plus misc improvements

Previous Next

Full log

View this message in rfc822 format

From: Liam Hupfer <liam <at> hpfr.net>
To: 76082 <at> debbugs.gnu.org
Cc: Liam Hupfer <liam <at> hpfr.net>, Andrew Tropin <andrew <at> trop.in>, Janneke Nieuwenhuizen <janneke <at> gnu.org>, Ludovic Courtès <ludo <at> gnu.org>, Tanguy Le Carrour <tanguy <at> bioneland.org>, Vagrant Cascadian <vagrant <at> debian.org>
Subject: [bug#76082] [PATCH 1/9] home: services: setup-environment: Use GUIX_PROFILE.
Date: Wed,  5 Feb 2025 22:24:57 -0600

setup-environment already defines this variable. Use it since it’s more
concise.

* gnu/home/services.scm (environment-variables->setup-environment-script):
Use GUIX_PROFILE.

Change-Id: Ib75d8df6294976f4e95cfa7d607dc0ba21ddd258
---
 gnu/home/services.scm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/home/services.scm b/gnu/home/services.scm
index 39c9033ad6..bbf2ba2404 100644
--- a/gnu/home/services.scm
+++ b/gnu/home/services.scm
@@ -277,28 +277,28 @@ (define (environment-variables->setup-environment-script vars)
                              (display "\
 HOME_ENVIRONMENT=$HOME/.guix-home
 GUIX_PROFILE=\"$HOME_ENVIRONMENT/profile\"
-PROFILE_FILE=\"$HOME_ENVIRONMENT/profile/etc/profile\"
+PROFILE_FILE=\"$GUIX_PROFILE/etc/profile\"
 [ -f $PROFILE_FILE ] && . $PROFILE_FILE
 
 case $XDG_DATA_DIRS in
-  *$HOME_ENVIRONMENT/profile/share*) ;;
-  *) export XDG_DATA_DIRS=$HOME_ENVIRONMENT/profile/share:$XDG_DATA_DIRS ;;
+  *$GUIX_PROFILE/share*) ;;
+  *) export XDG_DATA_DIRS=$GUIX_PROFILE/share:$XDG_DATA_DIRS ;;
 esac
 case $MANPATH in
-  *$HOME_ENVIRONMENT/profile/share/man*) ;;
-  *) export MANPATH=$HOME_ENVIRONMENT/profile/share/man:$MANPATH
+  *$GUIX_PROFILE/share/man*) ;;
+  *) export MANPATH=$GUIX_PROFILE/share/man:$MANPATH
 esac
 case $INFOPATH in
-  *$HOME_ENVIRONMENT/profile/share/info*) ;;
-  *) export INFOPATH=$HOME_ENVIRONMENT/profile/share/info:$INFOPATH ;;
+  *$GUIX_PROFILE/share/info*) ;;
+  *) export INFOPATH=$GUIX_PROFILE/share/info:$INFOPATH ;;
 esac
 case $XDG_CONFIG_DIRS in
-  *$HOME_ENVIRONMENT/profile/etc/xdg*) ;;
-  *) export XDG_CONFIG_DIRS=$HOME_ENVIRONMENT/profile/etc/xdg:$XDG_CONFIG_DIRS ;;
+  *$GUIX_PROFILE/etc/xdg*) ;;
+  *) export XDG_CONFIG_DIRS=$GUIX_PROFILE/etc/xdg:$XDG_CONFIG_DIRS ;;
 esac
 case $XCURSOR_PATH in
-  *$HOME_ENVIRONMENT/profile/share/icons*) ;;
-  *) export XCURSOR_PATH=$HOME_ENVIRONMENT/profile/share/icons:$XCURSOR_PATH ;;
+  *$GUIX_PROFILE/share/icons*) ;;
+  *) export XCURSOR_PATH=$GUIX_PROFILE/share/icons:$XCURSOR_PATH ;;
 esac
 
 " port)

base-commit: 52c05f3b120e641c8bd2d68cfcf0d6af947de27b
-- 
2.47.1

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.