ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

install: Pass 'local-file' literal strings for proper resolution.

Browse source 
This is a followup to 99c45877a9, 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.
This commit is contained in:
Ludovic Courtès 2019-12-01 23:31:50 +01:00
parent 6177b14bcf
commit 33d1c970c3
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gnu/system/install.scm
View file

@ -242,9 +242,6 @@ (define (cow-store-service)
(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 @@ (define directory
(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"