summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-06-20 23:46:32 +0200
committerLudovic Courtès <ludo@gnu.org>2016-06-20 23:50:46 +0200
commita9601e23528c6018a3a6d4ad44b7d119df67ab6b (patch)
treeeb0473f49782ef817cda64b466167ba704a943d6
parentde7e0e8ee07803f1cb7521f51d0f14e487182658 (diff)
downloadpatches-a9601e23528c6018a3a6d4ad44b7d119df67ab6b.tar
patches-a9601e23528c6018a3a6d4ad44b7d119df67ab6b.tar.gz
gexp: Use a relative file name.
This is a followup to cbbbb7be0fbaa11ff75bce92f2d82131ff8db104. * guix/gexp.scm (%utils-module): Use a file name relative to this file instead of using 'search-path'.
-rw-r--r--guix/gexp.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 2bf1013b3c..b929b79c26 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -856,8 +856,10 @@ and in the current monad setting (system type, etc.)"
(define %utils-module
;; This file provides 'mkdir-p', needed to implement 'imported-files' and
- ;; other primitives below.
- (local-file (search-path %load-path "guix/build/utils.scm")
+ ;; other primitives below. Note: We give the file name relative to this
+ ;; file you are currently reading; 'search-path' could return a file name
+ ;; relative to the current working directory.
+ (local-file "build/utils.scm"
"build-utils.scm"))
(define* (imported-files files