summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-09-18 15:11:40 +0200
committerLudovic Courtès <ludo@gnu.org>2019-09-18 23:08:28 +0200
commit96b35998e610c7fc37bf87bf9e07e63d3bebd0a3 (patch)
treefb1b2a5796de007812415e7104ae326451e057ca /gnu
parentf9c0400392843540a87985a67ffb9fb6e4dbc2fa (diff)
linux-container: 'eval/container' correctly passes -L and -C flags.
This fixes a type error. * gnu/system/linux-container.scm (eval/container): Use 'append-map', not 'map'. * tests/containers.scm ("eval/container, non-empty load path"): New test.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system/linux-container.scm12
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm
index c6124cd223b..2ab679ff3f1 100644
--- a/gnu/system/linux-container.scm
+++ b/gnu/system/linux-container.scm
@@ -257,11 +257,13 @@ effects."
257 (lowered-gexp-guile lowered)) 257 (lowered-gexp-guile lowered))
258 "/bin/guile") 258 "/bin/guile")
259 "guile" 259 "guile"
260 (append (map (lambda (directory) `("-L" ,directory)) 260 (append (append-map (lambda (directory)
261 (lowered-gexp-load-path lowered)) 261 `("-L" ,directory))
262 (map (lambda (directory) `("-C" ,directory)) 262 (lowered-gexp-load-path lowered))
263 (lowered-gexp-load-compiled-path 263 (append-map (lambda (directory)
264 lowered)) 264 `("-C" ,directory))
265 (lowered-gexp-load-compiled-path
266 lowered))
265 (list "-c" 267 (list "-c"
266 (object->string 268 (object->string
267 (lowered-gexp-sexp lowered)))))))))))) 269 (lowered-gexp-sexp lowered))))))))))))