From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:58747) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iu38s-0001TU-Gp for guix-patches@gnu.org; Tue, 21 Jan 2020 18:41:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iu38q-0004fB-KA for guix-patches@gnu.org; Tue, 21 Jan 2020 18:41:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42705) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iu38o-0004eR-7I for guix-patches@gnu.org; Tue, 21 Jan 2020 18:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iu38o-00067i-3a for guix-patches@gnu.org; Tue, 21 Jan 2020 18:41:02 -0500 Subject: [bug#39231] [PATCH] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:55577) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iu2Vk-0004GM-FZ for guix-patches@gnu.org; Tue, 21 Jan 2020 18:00:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iu2Ve-0001rx-9z for guix-patches@gnu.org; Tue, 21 Jan 2020 18:00:38 -0500 Received: from mail.iitp.ru ([188.93.104.8]:49150 helo=iitp.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iu2VZ-0001hT-Ma for guix-patches@gnu.org; Tue, 21 Jan 2020 18:00:34 -0500 From: Alexander Krotov Date: Wed, 22 Jan 2020 02:01:33 +0300 Message-Id: <20200121230133.12958-1-krotov@iitp.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39231@debbugs.gnu.org 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