guix-commits
[Top][All Lists]
Advanced

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

01/01: gnu: busybox: Parameterize reference to /gnu/store.


From: Taylan Ulrich B.
Subject: 01/01: gnu: busybox: Parameterize reference to /gnu/store.
Date: Fri, 15 May 2015 14:39:25 +0000

taylanub pushed a commit to branch master
in repository guix.

commit fefd841887affda863ba03ad8f933f423302ac8f
Author: Taylan Ulrich Bayırlı/Kammer <address@hidden>
Date:   Fri May 15 10:59:44 2015 +0200

    gnu: busybox: Parameterize reference to /gnu/store.
    
    * gnu/packages/busybox.scm (busybox): Call %store-directory instead of
      referencing "/gnu/store" directly.
---
 gnu/packages/busybox.scm |    5 +++--
 1 files changed, 3 insertions(+), 2 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) #\/)))))
 
            (substitute* "testsuite/date/date-works-1"
              (("/bin/date") (which "date")))



reply via email to

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