aboutsummaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-04-26 16:36:48 +0200
committerLudovic Courtès <ludo@gnu.org>2014-04-28 23:24:17 +0200
commit02100028bb78b9bb17764eab0f009fd6fa07fd7b (patch)
tree255dfd289ab01e3b1caa0c10580b0f90077eaa1c /gnu/system.scm
parent21b679f6944f4e1f09f949322f5242b761dc22a7 (diff)
downloadguix-02100028bb78b9bb17764eab0f009fd6fa07fd7b.tar
guix-02100028bb78b9bb17764eab0f009fd6fa07fd7b.tar.gz
gnu: Use gexps in obvious places in (gnu system ...).
* gnu/system.scm (operating-system-boot-script): Use 'gexp->file' instead of 'text-file*'. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Likewise. (system-qemu-image/shared-store-script)[builder]: Turn into a gexp. Use 'gexp->derivation' instead of 'derivation-expression'.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 93858e972a..6308867794 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -19,6 +19,7 @@
(define-module (gnu system)
#:use-module (guix store)
#:use-module (guix monads)
+ #:use-module (guix gexp)
#:use-module (guix records)
#:use-module (guix packages)
#:use-module (guix derivations)
@@ -333,10 +334,9 @@ we're running in the final root."
(etc (operating-system-etc-directory os))
(dmd-conf (dmd-configuration-file services
(derivation->output-path etc))))
- ;; FIXME: Use 'sexp-file' or similar.
- (text-file* "boot"
- "(execl \"" dmd "/bin/dmd\" \"dmd\"
- \"--config\" \"" dmd-conf "\")")))
+ (gexp->file "boot"
+ #~(execl (string-append #$dmd "/bin/dmd")
+ "dmd" "--config" #$dmd-conf))))
(define (operating-system-derivation os)
"Return a derivation that builds OS."