From patchwork Tue Jan 16 08:27:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 58931 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 7FA0527BBE9; Tue, 16 Jan 2024 08:28:27 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 7BDF827BBE2 for ; Tue, 16 Jan 2024 08:28:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPenl-0003fK-1v; Tue, 16 Jan 2024 03:28:05 -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 1rPenj-0003f1-AR for guix-patches@gnu.org; Tue, 16 Jan 2024 03:28:03 -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 1rPeni-0004pQ-Va for guix-patches@gnu.org; Tue, 16 Jan 2024 03:28:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPeni-0007Rk-P7 for guix-patches@gnu.org; Tue, 16 Jan 2024 03:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68498] [PATCH] guix-install.sh: Make Guix modules available too. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jan 2024 08:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68498@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170539368028613 (code B ref -1); Tue, 16 Jan 2024 08:28:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jan 2024 08:28:00 +0000 Received: from localhost ([127.0.0.1]:47635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPenf-0007RR-LD for submit@debbugs.gnu.org; Tue, 16 Jan 2024 03:27:59 -0500 Received: from lists.gnu.org ([2001:470:142::17]:55238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPenc-0007R9-NY for submit@debbugs.gnu.org; Tue, 16 Jan 2024 03:27:57 -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 1rPenW-0003eZ-CQ for guix-patches@gnu.org; Tue, 16 Jan 2024 03:27:50 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPenV-0004mu-9b; Tue, 16 Jan 2024 03:27:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=xaYCop43/GujWJ1Zu4cagCrp98HAovLyopGma0Gt8vg=; b=pSq6TQqlNOg7yS 2a9RXMqELKEOw0YqKFrDs3VJvAMU4lAaY0jvjgEx7ZL6AV+8RdDUu5LXQta4eQ+hmDqvwIgw0zG2K 0eyhJxbNEknPxyVrgPmqLhtbvJs/Zu89AxebNjOZ9e0KxizwCKJhxDiriMvew/QOlGK4gvh07qZCY xlS/rap4SRZHPqq28r5N06r6UUSY581JnH7h0Fl8U0gCdEPIdz5LRu7Ccd5/Lr1QHBFmH8E8tz0hB P9q0wfBOir3mX/mYP5US3cjrEQSKT71mc/h4/lkk7tVB8ALhkol9ApQ5dopX12PHWIiDCjJshrAKd 4bxaksUQt2Ttbf7UL/YQ==; From: Janneke Nieuwenhuizen Date: Tue, 16 Jan 2024 09:27:43 +0100 Message-ID: <4a2bb9d98d265b73932a57c9a9bd2fc920e3f035.1705393477.git.janneke@gnu.org> X-Mailer: git-send-email 2.41.0 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 * etc/guix-install.sh (GUILE_LOAD_PATH): Prepend directory to current Guix modules. (GUILE_LOAD_COMPILED_PATH): Likewise to compiled modules. Change-Id: I0b2722a38b1f8ebab32142cbc372a23cadfb0620 --- etc/guix-install.sh | 5 +++++ 1 file changed, 5 insertions(+) base-commit: 21f5d20d68e0359f8111ccb936905649c70db9c1 diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 982fb0a266..a0bb3a556b 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 Janneke Nieuwenhuizen # # This file is part of GNU Guix. # @@ -557,6 +558,10 @@ GUIX_LOCPATH="$GUIX_PROFILE/lib/locale:${GUIX_LOCPATH:+:}$GUIX_LOCPATH" export GUIX_LOCPATH +# Make Guix modules available +export GUILE_LOAD_PATH="$_GUIX_PROFILE/share/guile/site/3.0${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH" +export GUILE_LOAD_COMPILED_PATH="$_GUIX_PROFILE/lib/guile/3.0/site-ccache${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH" + EOF }