From patchwork Mon Jan 18 16:51:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 26467 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 D180727BC15; Mon, 18 Jan 2021 17:18:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 84E3E27BC14 for ; Mon, 18 Jan 2021 17:18:35 +0000 (GMT) Received: from localhost ([::1]:44352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1YAk-0003be-LM for patchwork@mira.cbaines.net; Mon, 18 Jan 2021 12:18:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1Xl4-0002cr-00 for guix-patches@gnu.org; Mon, 18 Jan 2021 11:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1Xl3-0005jy-Nc for guix-patches@gnu.org; Mon, 18 Jan 2021 11:52:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l1Xl3-0000lB-Km for guix-patches@gnu.org; Mon, 18 Jan 2021 11:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45774] [PATCH core-updates v3 1/2] utils: Retrieve the store prefix from NIX_STORE_DIR, not STORE_DIR. References: <20210110200535.24377-1-maxim.cournoyer@gmail.com> In-Reply-To: <20210110200535.24377-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Jan 2021 16:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45774 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45774@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org, 45774@debbugs.gnu.org Received: via spool by 45774-submit@debbugs.gnu.org id=B45774.16109887202913 (code B ref 45774); Mon, 18 Jan 2021 16:52:01 +0000 Received: (at 45774) by debbugs.gnu.org; 18 Jan 2021 16:52:00 +0000 Received: from localhost ([127.0.0.1]:48143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Xl1-0000kv-Oi for submit@debbugs.gnu.org; Mon, 18 Jan 2021 11:51:59 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:34054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l1Xl0-0000kJ-5n for 45774@debbugs.gnu.org; Mon, 18 Jan 2021 11:51:58 -0500 Received: by mail-qt1-f175.google.com with SMTP id c1so11702062qtc.1 for <45774@debbugs.gnu.org>; Mon, 18 Jan 2021 08:51:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OT+qmkYntdzslMt0aEa0WPokhkPkZCvzMN7Y3wqDnes=; b=MGIIzkkXNRDniu9tx6tBn4mtgzV58V/BdDbuln+Auo/2t3wpbwSWkqyu0y9RR2GjYJ CNnp0qZn6zHTaO389bUYy1c5ulSBKKwrXm/vkcn3hOId+GM89NIKCEE2y9UFl6liTQ05 cW6hKgmGJdyViAw0zoi17bOc2f3a8mktZMM1C/bn8x9TMeJVfHb4rlsVGbF8p2MsqZHq DZB8gEG8RLfbL5WWNxsNl3zSy+k50HdokJ0B4KC3leuv4L5mm8oQTSYAo215mwDR867/ DkHRO6OeSlHLVYxJqV2bNdJWozcKxlGKo5DBRY45DNimf8h6hq9Kf3gW9IAwA0yqsTn6 cqhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OT+qmkYntdzslMt0aEa0WPokhkPkZCvzMN7Y3wqDnes=; b=keuPsI5opZj9y/evXy4A8lxFSy70QqdaGXeG1t1nnHHsEU+qYVEILCRpno3b03ffvj GY/Qcg+P+jC2afzI7CFC8uQVbli/g5y9BqcSc4bIRA2uuwIGG85sNS1x+K7bxRYlaS68 TLvpRG5PLkERjY5E0/keUg/7OSpfONrgwCLXVQ69vULmoSH6otJTQE8DFq/aFi6ZJNmz 3l5IFhDQJP/gK2tzayO+0M2mMQEI8bxb2hR9h32hVDTjeD8TXugy5ujJIotpSOFhb5Ey TjvV7ifzJvUR4uCaG/qLq1WHGIC46tzx2ALyHsj0n5ReksMB7+o9/nztlNksPS5801Bu O7nA== X-Gm-Message-State: AOAM531PjuciNxD7bXD/Nzu72YFSQHDkuPx+yLNBB1ESHbr0WzF7sd0x L1VmuLfCIPIQTGZf18zDwvs= X-Google-Smtp-Source: ABdhPJyfKMzqWFsk/bgqojpzFO8Y4j46+Op/f5deK+0ZPoI3p49cLfQ1DPxnDQAIXRpUlNxBr/2k8Q== X-Received: by 2002:ac8:6edd:: with SMTP id f29mr454223qtv.213.1610988712453; Mon, 18 Jan 2021 08:51:52 -0800 (PST) Received: from localhost.localdomain (dsl-149-228.b2b2c.ca. [66.158.149.228]) by smtp.gmail.com with ESMTPSA id m64sm10992602qkb.90.2021.01.18.08.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 08:51:51 -0800 (PST) From: Maxim Cournoyer Date: Mon, 18 Jan 2021 11:51:20 -0500 Message-Id: <20210118165122.25813-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.29.2 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 On the daemon side, nixStore gets set to the environment variable NIX_STORE_DIR, else the environment variable NIX_STORE else the compile time macro NIX_STORE_DIR (see the Settings::processEnvironment method in nix/libstore/globals.cc). Hence, it is more appropriate to lookup the environment variable NIX_STORE_DIR than NIX_STORE in (guix build utils). * guix/build/utils.scm (%store-directory): Call getenv with NIX_STORE_DIR instead of NIX_STORE. --- guix/build/utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 76180e67e0..2cbdb31505 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -144,7 +144,7 @@ (define (%store-directory) "Return the directory name of the store." - (or (getenv "NIX_STORE") + (or (getenv "NIX_STORE_DIR") "/gnu/store")) (define (store-file-name? file)