diff options
| author | Sergio Pastor Pérez <sergio.pastor-perez@inria.fr> | 2026-08-17 10:30:14 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2026-08-21 16:00:22 +0200 |
| commit | 9e4c90ea160066d0b8e23c1e73450e2fc9f68bea (patch) | |
| tree | be770b9723a5bf97dde5f3222e4bec525e9a103d /gnu/system.scm | |
| parent | bc9a4d924b4ee7110cd03e2c5dd066f6bc417dc4 (diff) | |
guix: Adjust environment setup so extensions are located without propagating Guix.
This change makes GUIX_EXTENSIONS_PATH handled specially so package extensions
do not need to propagate Guix or extend their native search path to locate the
extension.
* gnu/home/services.scm (environment-variables->setup-environment-script):
Setup GUIX_EXTENSIONS_PATH to locate extensions in profiles that do not
contain Guix.
* gnu/system.scm (operating-system-etc-service): Likewise.
* gnu/packages/containers.scm (guix-compose): Remove unneeded
'native-search-paths' specification.
* gnu/packages/package-management.scm (toys): Likewise.
(guix-xsearch): Likewise.
* guix/search-paths.scm ($GUIX_EXTENSIONS_PATH): Adjust comment.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 8b45d7a910a..a39917d49e6 100644 --- a/gnu/system.scm +++ b/gnu/system.scm | |||
| @@ -1072,6 +1072,9 @@ export MANPATH=$HOME/.guix-profile/share/man:/run/current-system/profile/share/m | |||
| 1072 | export INFOPATH=$HOME/.guix-profile/share/info:/run/current-system/profile/share/info | 1072 | export INFOPATH=$HOME/.guix-profile/share/info:/run/current-system/profile/share/info |
| 1073 | export XDG_DATA_DIRS=$HOME/.guix-profile/share:/run/current-system/profile/share | 1073 | export XDG_DATA_DIRS=$HOME/.guix-profile/share:/run/current-system/profile/share |
| 1074 | export XDG_CONFIG_DIRS=$HOME/.guix-profile/etc/xdg:/run/current-system/profile/etc/xdg | 1074 | export XDG_CONFIG_DIRS=$HOME/.guix-profile/etc/xdg:/run/current-system/profile/etc/xdg |
| 1075 | export GUIX_EXTENSIONS_PATH=\ | ||
| 1076 | $HOME/.guix-profile/share/guix/extensions | ||
| 1077 | :/run/current-system/share/guix/extensions | ||
| 1075 | 1078 | ||
| 1076 | # Make sure libXcursor finds cursors installed into user or system profiles. See <http://bugs.gnu.org/24445> | 1079 | # Make sure libXcursor finds cursors installed into user or system profiles. See <http://bugs.gnu.org/24445> |
| 1077 | export XCURSOR_PATH=$HOME/.icons:$HOME/.guix-profile/share/icons:/run/current-system/profile/share/icons | 1080 | export XCURSOR_PATH=$HOME/.icons:$HOME/.guix-profile/share/icons:/run/current-system/profile/share/icons |