From mboxrd@z Thu Jan 1 00:00:00 1970 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 Message-ID: <87mw10mcuk.fsf@netris.org> References: <87h9refc0y.fsf@gmail.com> <87vbfu15n6.fsf@gnu.org> <87d222ey57.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YuppP-0004CM-Ey for guix-devel@gnu.org; Tue, 19 May 2015 18:17:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YuppL-0005v1-Di for guix-devel@gnu.org; Tue, 19 May 2015 18:17:35 -0400 In-Reply-To: <87d222ey57.fsf@gmail.com> (Taylan Ulrich Kammer's message of "Fri, 15 May 2015 16:03:16 +0200") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Taylan Ulrich Kammer Cc: guix-devel@gnu.org, Alex Vorobiev Hi Taylan, Taylan Ulrich Kammer writes: > From 2dcd57e71c86c780e0e06ae5579c2f8e65b3de91 Mon Sep 17 00:00:00 2001 > From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= > > 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