| Message ID | 20210118165122.25813-1-maxim.cournoyer@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [bug#45774,core-updates,v3,1/2] utils: Retrieve the store prefix from NIX_STORE_DIR, not STORE_DIR. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
Hello, Maxim Cournoyer <maxim.cournoyer@gmail.com> 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
Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis: >> (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. Sounds good to me, thanks! Ludo’.
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)