diff options
| author | Alexander Krotov <krotov@iitp.ru> | 2020-01-22 02:01:33 +0300 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-01-26 23:21:39 +0100 |
| commit | 7ff169d04f52b15393b33a97959e2cd6a5957e26 (patch) | |
| tree | 3706588b53ad16cc99622fda27d330b0a4b96e38 | |
| parent | 29ba58c0ef3c1e4a6154a133203c9c09d138fd32 (diff) | |
| download | guix-7ff169d04f52b15393b33a97959e2cd6a5957e26.tar guix-7ff169d04f52b15393b33a97959e2cd6a5957e26.tar.gz | |
guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS
If $XDG_DATA_DIRS is unset, default value of "/usr/local/share:/usr/share"
is used according to XDG Base Directory Specification. However,
/etc/profile.d/guix.sh treats this value as empty list when appending its
own directory, so after installing Guix on the system, launchers such
as Rofi stop searching for .desktop files in /usr/share/applications/
and can't launch applications other than those installed with Guix.
This patch fixes the bug in generated /etc/profile.d/guix.sh
* etc/guix-install.sh (sys_create_init_profile): Use default value of
/usr/local/share:/usr/share/ before appending if $XDG_DATA_DIRS is not
set.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rwxr-xr-x | etc/guix-install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 0e677c2b90..bfd3842933 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -415,7 +415,7 @@ export GUIX_PROFILE GUIX_LOCPATH eval `guix package --search-paths=prefix 2> /dev/null` # set XDG_DATA_DIRS to include Guix installations -export XDG_DATA_DIRS="$GUIX_PROFILE/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS" +export XDG_DATA_DIRS="$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" EOF } |