guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: --with-store-dir and/or --localstatedir seem to be ignored


From: Mark H Weaver
Subject: Re: --with-store-dir and/or --localstatedir seem to be ignored
Date: Tue, 19 May 2015 18:17:23 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)

Hi Taylan,

Taylan Ulrich Kammer <address@hidden> writes:

> From 2dcd57e71c86c780e0e06ae5579c2f8e65b3de91 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>  <address@hidden>
> Date: Fri, 15 May 2015 10:59:44 +0200
> Subject: [PATCH] Parameterize references to /gnu/store.
>
> * gnu/packages/busybox.scm (busybox): Call %store-directory from (guix build
>   utils) instead of referencing "/gnu/store" directly.
>
> * guix/packages.scm (patch-and-repack): Likewise.
> ---
>  gnu/packages/busybox.scm | 5 +++--
>  guix/packages.scm        | 2 +-
>  2 files changed, 4 insertions(+), 3 deletions(-)
>
>
> diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm
> index d200cd7..13630b3 100644
> --- a/gnu/packages/busybox.scm
> +++ b/gnu/packages/busybox.scm
> @@ -53,8 +53,9 @@
>  
>             ;; There is no /usr/bin or /bin - replace it with /gnu/store
>             (substitute* "testsuite/cpio.tests"
> -              (("/usr/bin") "/gnu/store")
> -              (("usr") "gnu"))
> +              (("/usr/bin") (%store-directory))
> +              (("usr") (car (filter (negate string-null?)
> +                                    (string-split (%store-directory) #\/)))))

What is the rationale for replacing "usr" with "gnu" here?  In the
general case where (%store-directory) might be almost anything, I fail
to see why "usr" should be replaced with the first component of
(%store-directory).

      Mark



reply via email to

[Prev in Thread] Current Thread [Next in Thread]