From patchwork Wed Feb 14 13:03:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "pelzflorian (Florian Pelz)" X-Patchwork-Id: 60303 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 E511D27BBEA; Wed, 14 Feb 2024 13:06:56 +0000 (GMT) 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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 E352627BBE2 for ; Wed, 14 Feb 2024 13:06:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raEyO-0000FR-NH; Wed, 14 Feb 2024 08:06:48 -0500 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 1raEyK-0000BA-8D for guix-patches@gnu.org; Wed, 14 Feb 2024 08:06:45 -0500 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 1raEyJ-0000iu-UQ for guix-patches@gnu.org; Wed, 14 Feb 2024 08:06:43 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raEyb-0007Qb-TK for guix-patches@gnu.org; Wed, 14 Feb 2024 08:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69124] [PATCH] system: default-bash-profile: Add Guix Home search paths as well. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Feb 2024 13:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69124 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69124@debbugs.gnu.org Cc: Florian Pelz X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170791598828504 (code B ref -1); Wed, 14 Feb 2024 13:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 Feb 2024 13:06:28 +0000 Received: from localhost ([127.0.0.1]:50754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raEy3-0007Pg-NH for submit@debbugs.gnu.org; Wed, 14 Feb 2024 08:06:28 -0500 Received: from lists.gnu.org ([209.51.188.17]:56232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raEy1-0007PY-Pt for submit@debbugs.gnu.org; Wed, 14 Feb 2024 08:06:26 -0500 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 1raExj-0008Lr-6h for guix-patches@gnu.org; Wed, 14 Feb 2024 08:06:07 -0500 Received: from relay.yourmailgateway.de ([185.244.194.184]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1raExa-0000Ul-4W for guix-patches@gnu.org; Wed, 14 Feb 2024 08:06:06 -0500 Received: from relay01-mors.netcup.net (localhost [127.0.0.1]) by relay01-mors.netcup.net (Postfix) with ESMTPS id 4TZdjX1220z8xk2 for ; Wed, 14 Feb 2024 14:05:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1707915952; bh=ifN9EGfJQb5rSIlOLYOJZC0FZZF/IBDW7ozcEMYrmBo=; h=From:To:Cc:Subject:Date:From; b=Tf/IXU0QWgXPu9Hf5cXzJSrUrSyR8KiAPAfAu/9zT043LZDzaTTE8XKRmL0/O6ujA o/kAIN7LQAyN+tZnIk0achREC8C9145gR9AzjX0A+RGvd1shdYv56tz9jD3TM+a1DI 677ckgI/vOgaa2LfsGj0YP5GDXb5GYEIGP2EMIpfZUxM5T4IpPmhRfi9/EHXh5CwKQ YJHhSAZDmhBaQCEcun8KSebeq5tG6ZgJ97VlZa/V+qEc8ZMbyopBAFfVj/a5VOVL1Z WQoTuH2uyzrXbHIRM7wMghVQTFzYHybzNNAvgaSVzgdxyYW/Td9v4DQ2mQqAk3c8I7 cdK7i73R5PK+w== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by relay01-mors.netcup.net (Postfix) with ESMTPS id 4TZdjX0MFGz7wGc for ; Wed, 14 Feb 2024 14:05:52 +0100 (CET) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4TZdjW60nTz8sZf for ; Wed, 14 Feb 2024 14:05:51 +0100 (CET) Received: from florianrock64.fritz.box (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id 8BED382AB0; Wed, 14 Feb 2024 14:05:46 +0100 (CET) From: Florian Pelz Date: Wed, 14 Feb 2024 14:03:05 +0100 Message-ID: <20240214130444.16770-1-pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 8BED382AB0 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: lIwyefmXz5jPSwHz/XuznaIL0x8bxekKFIo9PdafBwDMrK/29Hcb4pbz Received-SPF: pass client-ip=185.244.194.184; envelope-from=pelzflorian@pelzflorian.de; helo=relay.yourmailgateway.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Ordinary .guix-profile is searched already. Also this makes desktop environments find packages installed in Guix Home. * gnu/system/shadow.scm (%default-bash-profile): Add Home search paths. --- gnu/system/shadow.scm | 1 + 1 file changed, 1 insertion(+) base-commit: 240bbfee8deb7b6b746dffee7204dea7051dced8 diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 8b3958ba5c..d9f13271d8 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -165,6 +165,7 @@ (define %default-bash-profile # Merge search-paths from multiple profiles, the order matters. eval \"$(guix package --search-paths \\ -p $HOME/.config/guix/current \\ +-p $HOME/.guix-home/profile \\ -p $HOME/.guix-profile \\ -p /run/current-system/profile)\"