guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: guix-commits
Subject: 01/01: install: Pass 'local-file' literal strings for proper resolution.
Date: Sun, 1 Dec 2019 17:39:05 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 33d1c970c323971da8d70a662748c7b1b520d6b6
Author: Ludovic Court├Ęs <address@hidden>
Date:   Sun Dec 1 23:31:50 2019 +0100

    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.
---
 gnu/system/install.scm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index bdf114c..4d1612ac 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"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]