* [bug#39231] [PATCH] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS
@ 2020-01-21 23:01 Alexander Krotov
2020-01-26 22:20 ` bug#39231: " Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Alexander Krotov @ 2020-01-21 23:01 UTC (permalink / raw)
To: 39231; +Cc: Alexander Krotov
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.
---
etc/guix-install.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index b57d71981f..da781d41ff 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -409,7 +409,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
}
--
2.25.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#39231: [PATCH] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS
2020-01-21 23:01 [bug#39231] [PATCH] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS Alexander Krotov
@ 2020-01-26 22:20 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2020-01-26 22:20 UTC (permalink / raw)
To: Alexander Krotov; +Cc: 39231-done
Hi,
Alexander Krotov <krotov@iitp.ru> skribis:
> 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.
Good catch. Applied, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-26 22:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-21 23:01 [bug#39231] [PATCH] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS Alexander Krotov
2020-01-26 22:20 ` bug#39231: " Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.