summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-12-01 23:31:50 +0100
committerLudovic Courtès <ludo@gnu.org>2019-12-01 23:36:52 +0100
commit33d1c970c323971da8d70a662748c7b1b520d6b6 (patch)
tree1c29ed7c8d4bc945f51153d23c01fbd143e4a166 /gnu
parent6177b14bcf93fdb8a9af930cdaed131036591b80 (diff)
downloadpatches-33d1c970c323971da8d70a662748c7b1b520d6b6.tar
patches-33d1c970c323971da8d70a662748c7b1b520d6b6.tar.gz
install: Pass 'local-file' literal strings for proper resolution.
This is a followup to 99c45877a984dd0148151b2e304afef6fb04f1a5, which introduced a regression: "guix system build gnu/system/install.scm" would fail to find the .tmpl files. * gnu/system/install.scm (/etc/configuration-files)[file]: Remove. [directory]: Use 'local-file' with a literal string.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system/install.scm11
1 files changed, 4 insertions, 7 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index bdf114c180..4d1612ac7f 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -242,9 +242,6 @@ the user's target storage device rather than on the RAM disk."
(define (/etc/configuration-files _)
"Return a list of tuples representing configuration templates to add to
/etc."
- (define (file f)
- (local-file (string-append "examples/" f)))
-
(define directory
(computed-file "configuration-templates"
(with-imported-modules '((guix build utils))
@@ -254,10 +251,10 @@ the user's target storage device rather than on the RAM disk."
(copy-file file
(string-append #$output "/"
target)))
- '(#$(file "bare-bones.tmpl")
- #$(file "beaglebone-black.tmpl")
- #$(file "desktop.tmpl")
- #$(file "lightweight-desktop.tmpl"))
+ '(#$(local-file "examples/bare-bones.tmpl")
+ #$(local-file "examples/beaglebone-black.tmpl")
+ #$(local-file "examples/desktop.tmpl")
+ #$(local-file "examples/lightweight-desktop.tmpl"))
'("bare-bones.scm"
"beaglebone-black.scm"
"desktop.scm"