From patchwork Tue Jan 21 23:01:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Krotov X-Patchwork-Id: 19950 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 813F717AE5; Wed, 22 Jan 2020 03:08:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 46E0E17A7B for ; Wed, 22 Jan 2020 03:08:32 +0000 (GMT) Received: from localhost ([::1]:35958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iu6Nb-0007Ax-Ld for patchwork@mira.cbaines.net; Tue, 21 Jan 2020 22:08:31 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#39231] [PATCH] guix-install.sh: Correctly treat empty or unset $XDG_DATA_DIRS Resent-From: Alexander Krotov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2020 23:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 39231 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39231@debbugs.gnu.org Cc: Alexander Krotov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157965001223469 (code B ref -1); Tue, 21 Jan 2020 23:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jan 2020 23:40:12 +0000 Received: from localhost ([127.0.0.1]:48678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu37y-00066N-39 for submit@debbugs.gnu.org; Tue, 21 Jan 2020 18:40:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:59906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iu2Vq-0005Ai-SO for submit@debbugs.gnu.org; Tue, 21 Jan 2020 18:00:50 -0500 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 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=iitp.ru; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=mail; bh=/ylfljySzbMWF0YIY/gOiR7aJX8=; b=bkVkWgk0cmfuiXHXfaVr jieaf/ZCSwb11F6eWWxl+x12EIpHf9vkYJ5GQpaD7YmiFiuMnhNcd1Yi6+VcDPCH fH/UIz8mpQfKOOgCqU5jHtElY2EIJVgUdQZjmIIMAd/q3wDSOCghi+DyFb4pIxmB iI+7zlNNNSNSSxhxWjTvUzU= Received: from [185.245.84.124] (account krotov@iitp.ru HELO localhost) by iitp.ru (CommuniGate Pro SMTP 6.0.11) with ESMTPSA id 35344000; Wed, 22 Jan 2020 02:00:30 +0300 From: Alexander Krotov Date: Wed, 22 Jan 2020 02:01:33 +0300 Message-Id: <20200121230133.12958-1-krotov@iitp.ru> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Mailman-Approved-At: Tue, 21 Jan 2020 18:40:09 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-Mailman-Approved-At: Tue, 21 Jan 2020 22:08:18 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 }