From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id MDbhOgHqbWeNEAEAe85BDQ:P1 (envelope-from ) for ; Thu, 26 Dec 2024 23:42:58 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id MDbhOgHqbWeNEAEAe85BDQ (envelope-from ) for ; Fri, 27 Dec 2024 00:42:58 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=EMVZhI6C; dkim=fail ("headers rsa verify failed") header.d=antr.me header.s=zmail header.b=UQn9G6Up; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735256577; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=M1gn2AvfMyupoa9Xjc8AWkQyJANkPiVyyydCtKHq0fY=; b=CrMXg8npiG9/Gl/aw4045xB8Bnd19aZcaNVLqAnZUHrSSFQsdTtvexMIQxyN6ok7l2cK4t I1uG+HrxYktar0VqEGNoyqr8HnrNQw+3UVN3i87k0nAYnKDrniKLVCw1ns0jSiIv7x370v cEK+5NizvfmmEULiNMyj+/oF7k5pVeCjhKK124seaaFnp9sninMa1xWq/R0DIqd1pQ/pKE Zz/slMUZ2flYYMSTEUIO3ozshkNh4c8JZOP2fYf5fRwKZtBSXAhSFWETOapxPVW6jwk0RA fN5d1fu5V2gMa+tOUg9t05RFNPcuxou5yT80XINJ+Ec6nIHxl6cAJr5MGROcSw== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=EMVZhI6C; dkim=fail ("headers rsa verify failed") header.d=antr.me header.s=zmail header.b=UQn9G6Up; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=2; s=key1; d=yhetil.org; t=1735256577; a=rsa-sha256; cv=fail; b=lnYIWkrQW/35mBBUd4OibTUrIaEevgDlCEDhj6uc2FIr9RGzSBaLJv/2DUkdzF3dSOTl9o 7muKDKBS+6jwEguiPuclHAJbe6ZAS2dwXSrTZG1+n3mM7ty5WXJ49Oy0UyATOqDz6KybvQ Br1mxnZF7ctJd9CtTIIi8yz0v+7kffv7yDK5I2td/ZXZdqGi9Stx5l10XH2wTlk2oTSLG5 asmy9F+04mH+zYXVoiuf8oHlXR/iOeIPUYsJ4quFpbRZDOxAsRIBRw8RsjGEXd+5IBsGOx 6weX2tFMasvCvdVQMl7c/ZWT2ceI6ilnPBj2qy+mlJcBB4v13cLis9QGK1j5pw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5CF8C87AEE for ; Fri, 27 Dec 2024 00:42:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tQxH5-0002ns-55; Thu, 26 Dec 2024 18:28:15 -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 1tQxH2-0002ng-64 for guix-patches@gnu.org; Thu, 26 Dec 2024 18:28:12 -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 1tQxH0-0001gq-9K; Thu, 26 Dec 2024 18:28:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=M1gn2AvfMyupoa9Xjc8AWkQyJANkPiVyyydCtKHq0fY=; b=EMVZhI6C7P/Svo2QEM8pf9q4nosw068BQChoRN3c7PZ1EL2ThpPKYjoe+19UexOphWi1oc+DVzgCMGj22/ce8Db3UIv5h0YKhzhWYpoZFH1O5ipHwcnpRDAw1E4ATe8Cn/dKEg5OYGPXejYB306r9nZmRLopuRIccCJ1b+MsleuEg3jrllGczMGlPLkke0CeojjXeo7LBVLxkcePipMh0dH7Ciu+65vRMzW8jmPirsJjF4FKDb2SBaF0ikQxH/Ub21ZaOJ1NpJ6Y5+PTtAY3HJTQ5CJEF5O+EzZhFzDl3wmrg31W9rADH9y06dLRXvxqP3/2TBZVZzScwcF4UdzgIw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tQxGs-0000vq-Vf; Thu, 26 Dec 2024 18:28:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75130] [PATCH] home: Load system profile in setup-environment. Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, janneke@gnu.org, ludo@gnu.org, tanguy@bioneland.org, guix-patches@gnu.org Resent-Date: Thu, 26 Dec 2024 23:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75130 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75130@debbugs.gnu.org Cc: andrew@trop.in, janneke@gnu.org, ludo@gnu.org, tanguy@bioneland.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: andrew@trop.in, janneke@gnu.org, ludo@gnu.org, tanguy@bioneland.org Received: via spool by submit@debbugs.gnu.org id=B.17352556603515 (code B ref -1); Thu, 26 Dec 2024 23:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Dec 2024 23:27:40 +0000 Received: from localhost ([127.0.0.1]:43131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQxGV-0000ub-SD for submit@debbugs.gnu.org; Thu, 26 Dec 2024 18:27:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:44656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tQxGU-0000uS-Ce for submit@debbugs.gnu.org; Thu, 26 Dec 2024 18:27:39 -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 1tQxGU-0002lE-3M for guix-patches@gnu.org; Thu, 26 Dec 2024 18:27:38 -0500 Received: from sender4-op-o15.zoho.com ([136.143.188.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tQxGS-0001Zo-6Z for guix-patches@gnu.org; Thu, 26 Dec 2024 18:27:37 -0500 ARC-Seal: i=1; a=rsa-sha256; t=1735255653; cv=none; d=zohomail.com; s=zohoarc; b=U908+7bo/86iu862JJ7BvShHnzCreN6cjKPfL+6ejnBaRVB9O9MGAYxnDSBwMSAHTs6CcTowDUHsgU9B6c7bpKnG8id/+NlRTDeStyQRXbYHHblUvQBFnYD/s3hHKDHvuXnHK5VrbMbUGWAt1VrBbn04upEOUcNyc6doqhjrz3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735255653; h=Content-Type:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=M1gn2AvfMyupoa9Xjc8AWkQyJANkPiVyyydCtKHq0fY=; b=QAHguq9YI56LKbgvO6jvuejxVM4KPDfXWa1KoNK6eocuQT5WNT0PNBMbEYgQH4qZ53bYOWxulkUUXToWkmpBXFE/v0t7qo87UlJfuL34lB0ye8eKHHEPq/9mozd3pD8SNY47xmsk1rYjjqK+B7Rk85LyiW+Vw/DlbCS7SD3QYZQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=antr.me; spf=pass smtp.mailfrom=mail@antr.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1735255653; s=zmail; d=antr.me; i=mail@antr.me; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Message-Id:Reply-To; bh=M1gn2AvfMyupoa9Xjc8AWkQyJANkPiVyyydCtKHq0fY=; b=UQn9G6UpiQ8pP91iT5VB6LJitQsGkQBRIShrbpJ2QHQwPzIM4gvxWAP+LdtxEy/C I9pPvyPbmdMdr5goM2saPENJhiyforpFCMzoOoWtEy9C1ZISK4Zdw8//JOvvecgWXsj VBG2Q4gJK5uZO4uaLDpk1Pb+HNroS2HsHPRFJeoI= Received: by mx.zohomail.com with SMTPS id 1735255652102708.1165160971351; Thu, 26 Dec 2024 15:27:32 -0800 (PST) From: Antero Mejr Date: Thu, 26 Dec 2024 18:27:30 -0500 Message-ID: <87a5ci10v1.fsf@antr.me> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-ZohoMailClient: External Received-SPF: pass client-ip=136.143.188.15; envelope-from=mail@antr.me; helo=sender4-op-o15.zoho.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -8.07 X-Spam-Score: -8.07 X-Migadu-Queue-Id: 5CF8C87AEE X-Migadu-Scanner: mx10.migadu.com X-TUID: qb4tZRigi79+ This ensures packages installed with `guix install` are available on $PATH when using Guix home with a foreign distro. * gnu/home/services.scm (environment-variables->setup-environment-script): Load system profile while loading home profile in setup-environment. Change-Id: I96b047b92f3c050b15e521fecc96740390cae2ca --- gnu/home/services.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 39c9033ad6..1cf5ce0835 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -268,8 +268,6 @@ (define (environment-variables->setup-environment-script vars) %store-monad (return `(("setup-environment" - ;; TODO: It's necessary to source ~/.guix-profile too - ;; on foreign distros ,(computed-file "setup-environment" #~(call-with-output-file #$output (lambda (port) @@ -280,6 +278,10 @@ (define (environment-variables->setup-environment-script vars) PROFILE_FILE=\"$HOME_ENVIRONMENT/profile/etc/profile\" [ -f $PROFILE_FILE ] && . $PROFILE_FILE +SYSTEM_ENVIRONMENT=$HOME/.guix-profile +SYSTEM_PROFILE_FILE=\"$SYSTEM_ENVIRONMENT/etc/profile\" +[ -f $SYSTEM_PROFILE_FILE ] && . $SYSTEM_PROFILE_FILE + case $XDG_DATA_DIRS in *$HOME_ENVIRONMENT/profile/share*) ;; *) export XDG_DATA_DIRS=$HOME_ENVIRONMENT/profile/share:$XDG_DATA_DIRS ;; base-commit: e4bdd464ebb49f4e698e5105f70b29688fff9475 -- 2.47.1