unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 45774@debbugs.gnu.org
Subject: [bug#45774] [PATCH core-updates v3 1/2] utils: Retrieve the store prefix from NIX_STORE_DIR, not STORE_DIR.
Date: Mon, 18 Jan 2021 11:51:20 -0500	[thread overview]
Message-ID: <20210118165122.25813-1-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20210110200535.24377-1-maxim.cournoyer@gmail.com>

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)
-- 
2.29.2





  parent reply	other threads:[~2021-01-18 17:18 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-10 20:05 [bug#45774] [PATCH core-updates 1/1] guix: packages: Allow patch-and-repack to work with plain files Maxim Cournoyer
2021-01-13 17:40 ` [bug#45774] [PATCH core-updates v2] build-systems/gnu: Allow unpacking/repacking more kind of files Maxim Cournoyer
2021-01-14 17:48   ` [bug#45773] [PATCH core-updates 0/1] Allow patch-and-repack to work with plain files Ludovic Courtès
2021-01-14 18:43     ` Maxim Cournoyer
2021-01-27  3:57       ` bug#45773: " Maxim Cournoyer
2021-01-18 16:51 ` Maxim Cournoyer [this message]
2021-01-18 16:51   ` [bug#45774] [PATCH core-updates v3 2/2] build-systems/gnu: Allow unpacking/repacking more kind of files Maxim Cournoyer
2021-01-27  3:58   ` [bug#45774] bug#45958: [PATCH core-updates v3 1/2] utils: Retrieve the store prefix from NIX_STORE_DIR, not STORE_DIR Maxim Cournoyer
2021-01-27 23:10     ` [bug#45958] " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210118165122.25813-1-maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=45774@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).