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) #\/))))) (substitute* "testsuite/date/date-works-1" (("/bin/date") (which "date"))) diff --git a/guix/packages.scm b/guix/packages.scm index a979f31..f6dda45 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -466,7 +466,7 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET." ;; SOURCE may be either a directory or a tarball. (and (if (file-is-directory? #+source) - (let* ((store (or (getenv "NIX_STORE") "/gnu/store")) + (let* ((store (%store-directory)) (len (+ 1 (string-length store))) (base (string-drop #+source len)) (dash (string-index base #\-)) -- 2.2.1