From patchwork Mon Jul 4 02:35:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 40497 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 F06C427BBEA; Mon, 4 Jul 2022 03:37:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9DBAA27BBE9 for ; Mon, 4 Jul 2022 03:37:33 +0100 (BST) Received: from localhost ([::1]:42846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8Bxs-0001bO-R3 for patchwork@mira.cbaines.net; Sun, 03 Jul 2022 22:37:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8BwQ-0007sp-Cj for guix-patches@gnu.org; Sun, 03 Jul 2022 22:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8BwQ-0004qE-4c for guix-patches@gnu.org; Sun, 03 Jul 2022 22:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o8BwQ-0000ia-1O for guix-patches@gnu.org; Sun, 03 Jul 2022 22:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56050] [PATCH v2 1/2] etc/guix-install.sh: Initialize XDG base directories. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jul 2022 02:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56050@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Philip McGrath Received: via spool by 56050-submit@debbugs.gnu.org id=B56050.16569021522724 (code B ref 56050); Mon, 04 Jul 2022 02:36:01 +0000 Received: (at 56050) by debbugs.gnu.org; 4 Jul 2022 02:35:52 +0000 Received: from localhost ([127.0.0.1]:45745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8BwG-0000hr-A0 for submit@debbugs.gnu.org; Sun, 03 Jul 2022 22:35:52 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:43669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8BwE-0000hd-QT for 56050@debbugs.gnu.org; Sun, 03 Jul 2022 22:35:51 -0400 Received: by mail-qt1-f172.google.com with SMTP id c13so8201684qtq.10 for <56050@debbugs.gnu.org>; Sun, 03 Jul 2022 19:35:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=op+cPVIL/6T6NLzv7IcLjEr1kvipP/0PcITee3iGHJY=; b=Xsm0ydVgcKZR53dxdFHsEwGNj8UWD/bPrmPHKBfT+qLfWVDVzLnrBRPVMYlMchfV0G QcLSQUzWsFgyipj4FHt3u3XCUMcH1lo0RjVJlK+DQHUb+mrZlKpLjLhDERlDil1tb3fY bDH6glgzW9eGIzbWvMFC60QpD2krJnDhmqzUaHmAbxM0IInLB/v4aRqpVEz1EHvI3PsY u+V/Pgtjvlt78YdU5FfKMK6lYcKSZjH36ItDWDDOwgi3w2GRCEWeRA5hVZZeGSHeQcd1 J0EQanM+tbavdZTn8+ORK2OY9AbS4AIhDmsjc6xi1DGuEgmjS/OptT7TIOG+Yrki9OiI DxbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=op+cPVIL/6T6NLzv7IcLjEr1kvipP/0PcITee3iGHJY=; b=ZsMKZiBigGIWd4t0vAn/GmD0o5fkoCGHCZXLnYkMRB+XFAXQee952mP3+5I0erRZ/o q4SZub/tWHGLNfpTh29hXvK2OFPT4x7l5wWVRulJnmTBASsvDbQRt+b0oYkeU3NhwyoV 1mzOUK0o8bGNfpUcfA8kHYVEiMExTGPic/ciFq8ja//8O5yc1+MH9WlcCQBfywavD16W 4FOiCPmbtP48OhSJQK4Dsj8dVTbOjdIgNjvZ6sTyP/pSPU+5SGR0DoG2xepNzTYKbo0f tQYg203PIofVjdFjL3KrtpcrZbBi8lZ12Hgs1Sc3eCmEXozyCR7Vh7RhmPhMio3SLg/8 I9BQ== X-Gm-Message-State: AJIora8SFoC8+osT6NEqxzQ/AX6mrrTkLzGdBESdqYnOWkAzWFOcdNIq rPnrQ5NQdU6GHd6e0Bh2P/rSIuAmygXrJ+ITcxM= X-Google-Smtp-Source: AGRyM1ucKlvUEWcoa8sK+Ybi/wzFBZQrqBmVgm9bZxzHT7MwSzkMKo6vsGZQ+jRy+uuEMNKAhIVauQ== X-Received: by 2002:ad4:594b:0:b0:470:852e:2efd with SMTP id eo11-20020ad4594b000000b00470852e2efdmr25918541qvb.115.1656902145266; Sun, 03 Jul 2022 19:35:45 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id a20-20020a05620a16d400b0069fe1dfbeffsm23354694qkn.92.2022.07.03.19.35.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 03 Jul 2022 19:35:45 -0700 (PDT) From: Philip McGrath Date: Sun, 3 Jul 2022 22:35:02 -0400 Message-Id: <605a74b1f064e2b057f6c9d57692dda5bccf8edf.1656899134.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 The default values from the XDG base directory specification make little sense for Guix System, and some scripts in Guix assume that they are not "empty or unset": for example, see . On foreign distros, however, omitting the default values is likely to break software from the distro, perhaps even preventing the desktop environment from starting. To smooth over the difference, use the system-wide configuration to ensure the environment variables are always explicitly set on foreign distros. * etc/guix-install.sh (sys_create_init_profile): Explicitly initialize XDG base directory variables. --- etc/guix-install.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index cd1a1c34c1..62a33a55c4 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -504,6 +504,16 @@ sys_create_init_profile() # This will not take effect until the next shell or desktop session! [ -d "/etc/profile.d" ] || mkdir /etc/profile.d # Just in case cat <<"EOF" > /etc/profile.d/guix.sh +# Explicitly initialize XDG base directory variables to ease compatibility +# with Guix System: see . +export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" +export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" +export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}" +export XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" +export XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS:-/etc/xdg}" +export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" +# no default for XDG_RUNTIME_DIR (depends on foreign distro for semantics) + # _GUIX_PROFILE: `guix pull` profile _GUIX_PROFILE="$HOME/.config/guix/current" export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH" @@ -522,7 +532,7 @@ export GUIX_LOCPATH [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" # set XDG_DATA_DIRS to include Guix installations -export XDG_DATA_DIRS="$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" +export XDG_DATA_DIRS="$GUIX_PROFILE/share:$XDG_DATA_DIRS" EOF } From patchwork Mon Jul 4 02:35:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 40496 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 0908627BBEA; Mon, 4 Jul 2022 03:36:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B982327BBE9 for ; Mon, 4 Jul 2022 03:36:19 +0100 (BST) Received: from localhost ([::1]:40086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o8Bwg-0008Bl-Sy for patchwork@mira.cbaines.net; Sun, 03 Jul 2022 22:36:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o8BwQ-0007tU-NZ for guix-patches@gnu.org; Sun, 03 Jul 2022 22:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o8BwQ-0004qK-FK for guix-patches@gnu.org; Sun, 03 Jul 2022 22:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o8BwQ-0000ih-DS for guix-patches@gnu.org; Sun, 03 Jul 2022 22:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56050] [PATCH v2 2/2] etc/guix-install.sh: Check for profile from 'guix home'. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Jul 2022 02:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56050@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Philip McGrath Received: via spool by 56050-submit@debbugs.gnu.org id=B56050.16569021552740 (code B ref 56050); Mon, 04 Jul 2022 02:36:02 +0000 Received: (at 56050) by debbugs.gnu.org; 4 Jul 2022 02:35:55 +0000 Received: from localhost ([127.0.0.1]:45748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8BwI-0000i8-O7 for submit@debbugs.gnu.org; Sun, 03 Jul 2022 22:35:54 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:42685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o8BwG-0000hD-BK for 56050@debbugs.gnu.org; Sun, 03 Jul 2022 22:35:52 -0400 Received: by mail-qt1-f174.google.com with SMTP id g14so8208448qto.9 for <56050@debbugs.gnu.org>; Sun, 03 Jul 2022 19:35:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kFdYf/ErQ/xtl0T3oGKVHl1DFMsHEaLWR9C9JbPPfIE=; b=bqmyt3CRc9d2yF635tVc1+HRXl2KHR/Hb+8ur1+ktBpTwHxPPYc7Obtv5o8olweUbm Dl9EoC7M3cNkSutt/jGkORQVAZs0Yvij2zvF0tIE5Tjg84aN3EdqFzGKrB3+gsbcqcXy VjoVeYMo64kcn+004v9Pp6GJJ3M5cvAIc6Sk4mCks/LKZA/z/iYCXpgwQLgYUcqf+Erz LrvfsGoTw7Th9+j1T2wMFXnZF+iHxhO9jklC6WIhYzHtKaH7mkNehvvLzR9Z2ptnGjcQ UhUgsrRXAELnIJv92EQ2Mx1oajVuAc16Wk/jWYXMJ8ki1CKSUUX+V0jkN6CW15psDLhj oFew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kFdYf/ErQ/xtl0T3oGKVHl1DFMsHEaLWR9C9JbPPfIE=; b=k7V64ThcQ4fH0JZvqX0IizT71nqbl71NNEE1d4Cr4KdlKq+kQ5tWC+kgpJzgUA/mbH t/jDbLorXhg1dJn0CAj8lLT6Z6j08zODRNs1a6EBGa1FAb37/Fz8MIOMxnAiPTykpKSv lxZ9jM8WEirQKYe/gYSJrpOGgEejm0KanEjzJI76DcuwuU6OKFKzClA4HnWN9FR3ahrR qQaajLof+x5CZnFs3NsOWKOMylbesooi0gZSDKEmDNfrT+twXeetHOFnQqNP0zw0TnF9 Dfooh/MWXwTnvszXRdq9SDCQyHH+6rMMV8D8Yiet/ytaNq/dzbvFcztKebUYlvo33lum q6Tg== X-Gm-Message-State: AJIora9cplWdXRkQM0uwqfuIm3XL+Qhd1FUAY0SnAA/OtcnlXGopy3U0 WMVwO5zP5FkPNpMHtRRgPsBbfcUQj1mVSauUnCU= X-Google-Smtp-Source: AGRyM1vDLXG4mCxfSr27uGlQff6I8oqen5OCiMg0+k5IxOPWHkHxZiYS1qi2b+OwdN5Dq7Bgia44eA== X-Received: by 2002:a05:6214:29ca:b0:472:fa99:100 with SMTP id gh10-20020a05621429ca00b00472fa990100mr822904qvb.87.1656902151939; Sun, 03 Jul 2022 19:35:51 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id c3-20020ac84e03000000b00304f55e56e4sm19302605qtw.40.2022.07.03.19.35.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 03 Jul 2022 19:35:51 -0700 (PDT) From: Philip McGrath Date: Sun, 3 Jul 2022 22:35:03 -0400 Message-Id: <9e68ef3237150756a97d0e3eba94a6b08879eeca.1656899134.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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 "$HOME/.guix-home/profile" exists, use it for GUIX_PROFILE instead of "$HOME/.guix-profile". * etc/guix-install.sh (sys_create_init_profile): Check for 'guix home' profile. --- etc/guix-install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 62a33a55c4..300681e111 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -524,7 +524,9 @@ export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH" export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH" # GUIX_PROFILE: User's default profile -GUIX_PROFILE="$HOME/.guix-profile" +# Prefer the one from 'guix home' if it exists. +GUIX_PROFILE="$HOME/.guix-home/profile" +[ -L $GUIX_PROFILE ] || GUIX_PROFILE="$HOME/.guix-profile" [ -L $GUIX_PROFILE ] || return GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" export GUIX_LOCPATH