From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mJlLHg7lEGDnMQAA0tVLHw (envelope-from ) for ; Wed, 27 Jan 2021 03:59:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 6DsrGg7lEGD8EAAA1q6Kng (envelope-from ) for ; Wed, 27 Jan 2021 03:59:10 +0000 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 387799403A6 for ; Wed, 27 Jan 2021 03:59:10 +0000 (UTC) Received: from localhost ([::1]:51200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4bz3-0006GM-74 for larch@yhetil.org; Tue, 26 Jan 2021 22:59:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4byw-0006Fz-2e for guix-patches@gnu.org; Tue, 26 Jan 2021 22:59:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59963) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4byv-0001y5-S0 for guix-patches@gnu.org; Tue, 26 Jan 2021 22:59:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l4byv-0006hE-RN for guix-patches@gnu.org; Tue, 26 Jan 2021 22:59:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45774] bug#45958: [PATCH core-updates v3 1/2] utils: Retrieve the store prefix from NIX_STORE_DIR, not STORE_DIR. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Jan 2021 03:59: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: 45958-done@debbugs.gnu.org Received: via spool by 45774-done@debbugs.gnu.org id=D45774.161171994125727 (code D ref 45774); Wed, 27 Jan 2021 03:59:01 +0000 Received: (at 45774-done) by debbugs.gnu.org; 27 Jan 2021 03:59:01 +0000 Received: from localhost ([127.0.0.1]:43274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4byu-0006gs-Tp for submit@debbugs.gnu.org; Tue, 26 Jan 2021 22:59:01 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:41445) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l4byu-0006gc-3X; Tue, 26 Jan 2021 22:59:00 -0500 Received: by mail-qv1-f51.google.com with SMTP id h21so483879qvb.8; Tue, 26 Jan 2021 19:58:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=Zt9DiiPCWqltC7WcZm2o694F5WAmWxbhJfqf1wqFUnk=; b=Sg7I4n/+q4aBhc6LuB/Mw8Vfw0VCvHvbzc+IgKaqZoG/Z0sWQLf6JVgZPAlkvUo1rY Q/W6wVYqKa5NoOFLOy6Qb8X75rc8wovCFcJAOs8fjJqBLJ0/vCT6voqTuo/XHWAtZEf9 VaKme7amAjKEw6xyMrkeMY6VmUek50E9W0GcF3bYzeH2dx8UMaXfuet28nU8ZIZN5E7G M2xyNzpuUvN+EkIZzQvVUw9mGpLguQMuBfIghXfQLulEpt0LEb6YIPmyb5BFn2nZuwEE m8BE41BzLoOCBY3vbGH3KLop3yk49fjAAV15zIrAai1Zo4VRPOnk0zAZwpjMrusw4nfd +OFw== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=Zt9DiiPCWqltC7WcZm2o694F5WAmWxbhJfqf1wqFUnk=; b=XgB9QdZCpDwNC+IyrAdNtugEyhYlsWGhTEiUscA1VGAPSp5muJTLHmf2w6B6lCRvsm evAjFKNrwY+0imMMKKip24vrcQngZfxXK3h8LmsAyfHL2XST4p4qjFjoLmBt1NOOWglw X21IVDGpsA2iNKYIeGY5yDJIC/BQGOxuEo7v/GWcMPuBBo00jXlJz7GETIKCEJ+DVc2g Ym4x2KwEejCAWs0aaqFn3SO9oepzZLvmyeV+9wZM6kEnFURLUM1gCFkX2MOAdod535S2 7kr7H9/Fg4NK4vDStapGJPsHk36cvYnYYs1B0cGPcLezlLtT9DuY7JQWVAK6UMPMBQ9k gW3Q== X-Gm-Message-State: AOAM531vMtHWJy+DcOEgEoYOMC58yqV4GgfhBl6pyq199g1VzrHGbnuK 8j8Q6QeaXOQ/C4bcgJ41Z3k= X-Google-Smtp-Source: ABdhPJzu/n/90ZMYIIIC+HPqkL6/Yfs11EzuqyFA2HD6jwJYaddoxN/MnzFJq+qqv/SrP5bE+uGlzg== X-Received: by 2002:a0c:b38b:: with SMTP id t11mr8827143qve.58.1611719934559; Tue, 26 Jan 2021 19:58:54 -0800 (PST) Received: from hurd (dsl-10-132-34.b2b2c.ca. [72.10.132.34]) by smtp.gmail.com with ESMTPSA id e185sm405684qkb.127.2021.01.26.19.58.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 19:58:54 -0800 (PST) From: Maxim Cournoyer References: <20210118165122.25813-1-maxim.cournoyer@gmail.com> Date: Tue, 26 Jan 2021 22:58:53 -0500 In-Reply-To: <20210118165122.25813-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Mon, 18 Jan 2021 11:51:20 -0500") Message-ID: <87sg6nyqrm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: , Cc: 45774-done@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.25 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b="Sg7I4n/+"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 387799403A6 X-Spam-Score: -1.25 X-Migadu-Scanner: scn0.migadu.com X-TUID: 2r21RWEeOvJB Hello, Maxim Cournoyer writes: > 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) I found that both environment variables should be honored and pushed with a revised explanation in 47a6a938c3c4d0bbe7b6a3c64ff75d7bfb2f24fb. Closing, Maxim