Re: 01/09: patches: honor NIX_STORE in site.py.

[Ludovic Courtès]

Hello reepca,

Since you mentioned on IRC that this commit is a candidate for ‘master’,
I’m replying here.

Perhaps in the future you could email address@hidden for specific
commits like this one, especially when it’s not strictly related to the
daemon?

address@hidden skribis:

> commit c44484dc2008f624788a228925e6cef2bdc6c917
> Author: Caleb Ristvedt <address@hidden>
> Date:   Wed Jan 30 17:00:32 2019 -0600
>
>     patches: honor NIX_STORE in site.py.
>     
>     Previously various python packages would fail to work unless the store 
> they
>     were kept in was /gnu/store. This fixes that.
>     
>     * gnu/packages/patches/python-2.7-site-prefixes.patch: Try NIX_STORE first
>       and only use /gnu/store as a fallback.

[...]

> --- a/configure.ac
> +++ b/configure.ac
> @@ -295,7 +295,8 @@ AC_CONFIG_FILES([Makefile
>                   po/guix/Makefile.in
>                   po/packages/Makefile.in
>                   etc/guix-daemon.cil
> -                 guix/config.scm])
> +                 guix/config.scm
> +              gnu/packages/patches/python-2.7-site-prefixes.patch])

./configure does not generate any patch files based on patch templates,
and that’s on purpose.  Instead, when we need something like this, we
handle it the way ld-wrapper.in is handled: by doing the substitution
when creating the derivation.

In this case I’d suggest substituting @storedir@ in a post-unpack phase.

Does that make sense?

Also, the summary line of the commit message should be something like:

  gnu: address@hidden: Honor NIX_STORE.

Last, the patch would need to go to ‘core-updates’ because of the number
of rebuilds it entails.

Could you send an updated version of the patch?

Thanks,
Ludo’.