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>

4 files changed, 7 insertions, 7 deletions

diff --git a/gnu/home/services.scm b/gnu/home/services.scm
index 93d6881954c..f7d0ff08228 100644
--- a/gnu/home/services.scm
+++ b/gnu/home/services.scm
@@ -330,6 +330,10 @@ case $XCURSOR_PATH in
   *$GUIX_PROFILE/share/icons*) ;;
   *) export XCURSOR_PATH=$GUIX_PROFILE/share/icons:$XCURSOR_PATH ;;
 esac
+case $GUIX_EXTENSIONS_PATH in
+  *$GUIX_PROFILE/share/guix/extensions*) ;;
+  *) export GUIX_EXTENSIONS_PATH=$GUIX_PROFILE/share/guix/extensions:$GUIX_EXTENSIONS_PATH ;;
+esac
 
 # Keep the shell environment clean.
 unset GUIX_PROFILE PROFILE_FILE
diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm
index f3c74a2c715..24c5e8fe577 100644
--- a/gnu/packages/containers.scm
+++ b/gnu/packages/containers.scm
@@ -1262,8 +1262,6 @@ contents, and discovering ways to shrink the size of Docker/OCI image.")
     (native-inputs (list guile-3.0))
     ;; Avoid setting propagated so that we use the user’s profile.
     (inputs (list guix guile-dotenv guile-yamlpp))
-    (native-search-paths
-     (list $GUIX_EXTENSIONS_PATH))
     (synopsis "Guix' docker compose compatibility layer")
     (description "A toolkit to run, read and write docker-compose.yml files with
 Guix machinery.")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 796caee5f79..830e8cc47f4 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -861,7 +861,6 @@ high-performance computing} clusters.")
            guile-readline
            guile-sqlite3
            guix))
-    (native-search-paths (list $GUIX_EXTENSIONS_PATH))
     (home-page "https://toys.whereis.social/")
     (synopsis "Search engine for Guix channels")
     (description "Toys is a search engine for collecting and displaying Guix
@@ -924,10 +923,6 @@ interface for interacting with the application.")
     (native-inputs (list guile-3.0
                          guile-xapian
                          guix))
-    ;; This is very important since we want the extension to be available
-    ;; without having to add a vanilla guix to the current profile.
-    (native-search-paths
-     (list $GUIX_EXTENSIONS_PATH))
     (home-page "https://codeberg.org/Baleine/guix-xsearch")
     (synopsis "Extension for Guix to provide faster search using Xapian")
     (description
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
 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
 export XDG_CONFIG_DIRS=$HOME/.guix-profile/etc/xdg:/run/current-system/profile/etc/xdg
+export GUIX_EXTENSIONS_PATH=\
+$HOME/.guix-profile/share/guix/extensions
+:/run/current-system/share/guix/extensions
 
 # Make sure libXcursor finds cursors installed into user or system profiles.  See <http://bugs.gnu.org/24445>
 export XCURSOR_PATH=$HOME/.icons:$HOME/.guix-profile/share/icons:/run/current-system/profile/share/icons