From patchwork Fri Apr 5 17:09:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62731 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 DF4F927BBE9; Fri, 5 Apr 2024 18:10:05 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 0588627BBE2 for ; Fri, 5 Apr 2024 18:10:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsn4i-0007he-FD; Fri, 05 Apr 2024 13:10:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rsn4f-0007dZ-Bm for guix-patches@gnu.org; Fri, 05 Apr 2024 13:09:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsn4f-0000Jm-25 for guix-patches@gnu.org; Fri, 05 Apr 2024 13:09:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rsn4k-0007y8-Bq for guix-patches@gnu.org; Fri, 05 Apr 2024 13:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70218] [PATCH 1/2] guix-install.sh: Add default value for XCURSOR_PATH. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Apr 2024 17:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70218 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70218@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70218-submit@debbugs.gnu.org id=B70218.171233699830608 (code B ref 70218); Fri, 05 Apr 2024 17:10:02 +0000 Received: (at 70218) by debbugs.gnu.org; 5 Apr 2024 17:09:58 +0000 Received: from localhost ([127.0.0.1]:37441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsn4d-0007xA-BO for submit@debbugs.gnu.org; Fri, 05 Apr 2024 13:09:58 -0400 Received: from wolfsden.cz ([37.205.8.62]:53408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rsn4W-0007w8-UH for 70218@debbugs.gnu.org; Fri, 05 Apr 2024 13:09:52 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id A6EE22A7DA3; Fri, 5 Apr 2024 17:09:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1712336981; bh=az+TZUrtegxDROIPUTr3UD4YYvkrpn0eilsPuFILGdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RpUf40Qv/sEnlCx6/yCcPE05BJAWTo05AyaY+x7qrKsrjX4rfUfjQVJSvga9u3dAM O0l7/kwTir/DVnhJDzTZiTWkkkbHh6ekCQe20140+f4hm90ifH9nHABkZQRfcLUg2J pFw4x5QkcfWveX0jzhjVrdGOgj5WMGuboMG+48O1gREpCgN8fXKdd7SHYRF7yC8JyB Q8L3Rc9Mb5P8QtDuHw999WCHMObC9Dfv9qpcvcATyi63an1VTI8PDyeZgSRXjj3dAq l6OYpHogmVI3pc1ZwJUSsZ2WdajpMnefZp85mYgEI4Cy0odBhnmGwNqtjlmMtLjJTs 7PdpdKusFzFc3KTWzyvMwkn1Ll4uenqyWToXNrVueRUxCfrT7c1ENtGa8puGQV/722 ivve2JJG2uRBv9+VnW/EMrmIw69cfA54WKlXrN2m3aNv9pkLyPU7Do6LyGTL/wq1+m IC/o74O+1ooK//1MuZ4M0Omxl5t8a2DCvH4Mi1fjicoLl9pCJAR1PlmsCQGTqlgnO4 403cxQ+sKOcvbZCw8zaq2MCIa623p3A4/CaAe+Y5tsQ3YVNqetj3j1VmZKGWPS5zfH m1OSux8CHCw3NCPJsqAZMmRMjfpEvq8WKI/CrTM7RSLzFDltQsHKcB/gyUXI/XiDt6 n4LDASL/3R2doRcmQuypUqXs= Received: from localhost (unknown [193.32.127.156]) by wolfsden.cz (Postfix) with ESMTPSA id C59A92A760D; Fri, 5 Apr 2024 17:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1712336980; bh=az+TZUrtegxDROIPUTr3UD4YYvkrpn0eilsPuFILGdU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KXSZRFUl01ixFstlHn6K2kJwMW3iiY5viZMMxLKCKlSAYmGo+9incgrIoP6eSABxh Xb3SXzwViCCFxqD2CtGqAthWP8Jf5vYQB8aOYX930yuXlq4MZFNFqRLV8fXwMa5yKA otOnvMzp065kLslMAlrkQdqoCRiCy2xsErqy6O4X8aH+7hDRBz+KO0UiBDuEraA/i4 +dbTrySATktb0cYYcspW4sIDIzLmoHY92AHdk8tq9aFG+4kNWf7cncYdFDLRZ48dTC zwAvcWwrm1P6xuwyyiyyKzmsm7RIBw9Ubj3yhpTNV8ojSlL0qh8pO4YxLSalZDcfEs ZVo4+BUHG6gEtvn0mmhP9TmJSkjUCllKPDoLLv9whBw8aO8I52a4BR/VvCtGYlQpKo ONbxc4muSCYg1Fm0X7XxmxKNle0jG9psXD0Wq441fIAtnkQuwCr33G0LHx3J7YiBwK w4iUZgM3xaFnl5qnFaVVIS7P5K29h+fVYZR3AFxJ4WMDtpt9Urp+3M7FIGJ6eYEwOv n9moSuc99gL9LmeW58mwj/1fMT09mT81tT66+Wp7rXW00xQbY1K8Umun6rf1uIj7GN WsT5CQoTESABM1Uy/degPx48Ctmc6pBHw2b6AaUOb6vx5WfXQqxLTAO5SVdnaAB63D hE+AgH4r0AeuH4ppmQ2dV/yk= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 5 Apr 2024 19:09:36 +0200 Message-ID: X-Mailer: git-send-email 2.41.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This improves compatibility with (at least) Gnome based systems. On my new Ubuntu 22.04 install the mouse cursor was broken (after I installed Guix) until I set this. * etc/guix-install.sh (sys_create_init_profile): Set default value for XCURSOR_PATH. Change-Id: I489f0307d99e4d8d82671f291c78b90c7b6dae4a --- etc/guix-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 982fb0a266..7876afa196 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -12,6 +12,7 @@ # Copyright © 2021, 2022, 2023 Maxim Cournoyer # Copyright © 2022 Prafulla Giri # Copyright © 2023 Andrew Tropin +# Copyright © 2024 Tomas Volf <~@wolfsden.cz> # # This file is part of GNU Guix. # @@ -527,6 +528,7 @@ sys_create_init_profile() cat <<"EOF" > /etc/profile.d/zzz-guix.sh # Explicitly initialize XDG base directory variables to ease compatibility # with Guix System: see . +export XCURSOR_PATH="${XCURSOR_PATH:-/usr/local/share/icons:/usr/share/icons}" 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}" From patchwork Fri Apr 5 17:09:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 62732 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 EFB3527BBEA; Fri, 5 Apr 2024 18:10:07 +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=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 611FB27BBE2 for ; Fri, 5 Apr 2024 18:10:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rsn4h-0007du-TJ; Fri, 05 Apr 2024 13:10:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rsn4e-0007d9-DX for guix-patches@gnu.org; Fri, 05 Apr 2024 13:09:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rsn4e-0000Jb-4O for guix-patches@gnu.org; Fri, 05 Apr 2024 13:09:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rsn4j-0007xz-Pa for guix-patches@gnu.org; Fri, 05 Apr 2024 13:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70218] [PATCH 2/2] guix-install.sh: Fix setting GUIX_LOCPATH. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Apr 2024 17:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70218 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70218@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 70218-submit@debbugs.gnu.org id=B70218.171233699530579 (code B ref 70218); Fri, 05 Apr 2024 17:10:01 +0000 Received: (at 70218) by debbugs.gnu.org; 5 Apr 2024 17:09:55 +0000 Received: from localhost ([127.0.0.1]:37439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rsn4b-0007x5-Eg for submit@debbugs.gnu.org; Fri, 05 Apr 2024 13:09:55 -0400 Received: from wolfsden.cz ([37.205.8.62]:52350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rsn4W-0007wA-UP for 70218@debbugs.gnu.org; Fri, 05 Apr 2024 13:09:52 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 9F9F22A7B8B; Fri, 5 Apr 2024 17:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1712336982; bh=Kfc+AFNKeHmcnvSzJsh5uxPNpq8jGkYlGi6eE48JzTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=D0L2iigZwzUnvh2ypt7HEEt+HNfm4BJPhsCm4GcG2i7ydKGIm4rwALDT1/28Z5IOU s7ReyIXdd8fhGoRT3RzNs8LeXW24rOWqvhjcuEKfDoUq5ML6PBvsmQD4Z6buToWbvw MZ7hXreNwnuF0wIx27qmGy9RU9IVIayTERhOnEMOxkOANcu9uTgc3RqeSyvYuViS5r 0EUgiJEi0MHmirzX8BhcpBuD2lDo2KjIpB9Lac9961oyM00bD/ep4wRt8uhfPczArT 607fWezZOqDicw6cJEJpUIvEPxmA2C94VBISOiGmCDBmnffLojXcNNQhIKKZqx2s5I aFHx4iOXm4K/72yXpcO3wnpsvNhltzGvirBWPk5s6nNIrF1dE0gU+GaUfr4MerqIgb llB7hmUDmY/rBc3Gwffb4ev8jQWsACaT+JQkIIvoQ/s1AwiWVvjwGmP/uH1N3xLfPY zRiV7sD9xRQhhA9ISEehJt3IQcrxmu+dlE9OZ8gQgfgXx2hXg9oIcJLCaCvvfNbGOX 41HjY7lCesLfkbNYxvH9S1KDzvrmz2UJW613PY7/c7CwKLLvrOkqq7f2Un5MTID2kg nHbToJbDa/+DyVKG7O/j5cmW7MRpSyzlaMVVbK94TAWN7yZbiBr0wcqgWmQeuTsj5c POqUsymSZDbAV9P5x17hN/w0= Received: from localhost (unknown [193.32.127.156]) by wolfsden.cz (Postfix) with ESMTPSA id 4C1CC2A42EB; Fri, 5 Apr 2024 17:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1712336982; bh=Kfc+AFNKeHmcnvSzJsh5uxPNpq8jGkYlGi6eE48JzTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=D0L2iigZwzUnvh2ypt7HEEt+HNfm4BJPhsCm4GcG2i7ydKGIm4rwALDT1/28Z5IOU s7ReyIXdd8fhGoRT3RzNs8LeXW24rOWqvhjcuEKfDoUq5ML6PBvsmQD4Z6buToWbvw MZ7hXreNwnuF0wIx27qmGy9RU9IVIayTERhOnEMOxkOANcu9uTgc3RqeSyvYuViS5r 0EUgiJEi0MHmirzX8BhcpBuD2lDo2KjIpB9Lac9961oyM00bD/ep4wRt8uhfPczArT 607fWezZOqDicw6cJEJpUIvEPxmA2C94VBISOiGmCDBmnffLojXcNNQhIKKZqx2s5I aFHx4iOXm4K/72yXpcO3wnpsvNhltzGvirBWPk5s6nNIrF1dE0gU+GaUfr4MerqIgb llB7hmUDmY/rBc3Gwffb4ev8jQWsACaT+JQkIIvoQ/s1AwiWVvjwGmP/uH1N3xLfPY zRiV7sD9xRQhhA9ISEehJt3IQcrxmu+dlE9OZ8gQgfgXx2hXg9oIcJLCaCvvfNbGOX 41HjY7lCesLfkbNYxvH9S1KDzvrmz2UJW613PY7/c7CwKLLvrOkqq7f2Un5MTID2kg nHbToJbDa/+DyVKG7O/j5cmW7MRpSyzlaMVVbK94TAWN7yZbiBr0wcqgWmQeuTsj5c POqUsymSZDbAV9P5x17hN/w0= From: Tomas Volf <~@wolfsden.cz> Date: Fri, 5 Apr 2024 19:09:37 +0200 Message-ID: <6b147273d133a1dbdcc2141be4fec18ffe1112fa.1712336516.git.~@wolfsden.cz> X-Mailer: git-send-email 2.41.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches After installing Guix home on my new foreign system, the locale did not work and GDM did not even let me to log in. After some digging around using tty3 and tty4, I realized the GUIX_LOCPATH is not being set properly. I had nothing installed in the ~/.guix-profile (the symlink did not even exist) and I had glibc-locales installed in ~/.guix-home, yet GUIX_LOCPATH contained "$HOME/.guix-profile/lib/locale:". I believe when the code was modified from the original "home or profile" to the current "home and profile" the || was used by accident instead of &&. I also remove the trailing :, since it is taken care of by the ${...:+:}. * etc/guix-install.sh (sys_create_init_profile): Change-Id: I8a3287fe809af58aee2edc924154eecf91fa1eb8 --- etc/guix-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 7876afa196..e7a8ca6476 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -549,13 +549,13 @@ export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH" # GUIX_PROFILE: User's default profile and home profile GUIX_PROFILE="$HOME/.guix-profile" [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" -[ -L "$GUIX_PROFILE" ] || \ -GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH" +[ -L "$GUIX_PROFILE" ] && \ +GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH" GUIX_PROFILE="$HOME/.guix-home/profile" [ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" -[ -L "$GUIX_PROFILE" ] || \ -GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH" +[ -L "$GUIX_PROFILE" ] && \ +GUIX_LOCPATH="$GUIX_PROFILE/lib/locale${GUIX_LOCPATH:+:}$GUIX_LOCPATH" export GUIX_LOCPATH