From 7c9325a9ecad1a8d02793aadb2e1730b4a8de48b Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 3 Feb 2014 23:37:09 +0100
Subject: gnu: dmd: Use 'text-file*' when building Xorg's config file.

* gnu/system/dmd.scm (xorg-service)[xserver.conf]: Change to use
  'text-file*' instead of 'text-file'.
  Adjust body accordingly.  Remove now extraneous packages from the
  service's 'inputs' field.
---
 gnu/system/dmd.scm | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

(limited to 'gnu/system')

diff --git a/gnu/system/dmd.scm b/gnu/system/dmd.scm
index 505c4c9afb..656c2f5634 100644
--- a/gnu/system/dmd.scm
+++ b/gnu/system/dmd.scm
@@ -273,26 +273,15 @@ true, it must be a string specifying the default network gateway."
 (define (xorg-service)
   "Return a service that starts the Xorg graphical display server."
   (define (xserver.conf)
-    (mlet %store-monad ((fonts (package-file font-adobe75dpi
-                                             "lib/X11/fonts"))
-                        (xorg  (package-file xorg-server
-                                             "lib/xorg/modules"))
-                        (vesa  (package-file xf86-video-vesa
-                                             "lib/xorg/modules/drivers"))
-                        (kbd   (package-file xf86-input-keyboard
-                                             "lib/xorg/modules/input"))
-                        (mouse (package-file xf86-input-mouse
-                                             "lib/xorg/modules/input")))
-      (text-file "xserver.conf"                   ; let's go!
-                 (string-append "
+    (text-file* "xserver.conf" "
 Section \"Files\"
-  FontPath \"" fonts "\"
-  ModulePath \"" vesa "\"
-  ModulePath \"" mouse "\"
-  ModulePath \"" kbd "\"
-  ModulePath \"" xorg "\"
-  ModulePath \"" xorg "/extensions\"
-  ModulePath \"" xorg "/multimedia\"
+  FontPath \"" font-adobe75dpi "/lib/X11/fonts\"
+  ModulePath \"" xf86-video-vesa "/lib/xorg/modules/drivers\"
+  ModulePath \"" xf86-input-mouse "/lib/xorg/modules/input\"
+  ModulePath \"" xf86-input-keyboard "/lib/xorg/modules/input\"
+  ModulePath \"" xorg-server "/lib/xorg/modules\"
+  ModulePath \"" xorg-server "/lib/xorg/modules/extensions\"
+  ModulePath \"" xorg-server "/lib/xorg/modules/multimedia\"
 EndSection
 
 Section \"ServerFlags\"
@@ -323,7 +312,7 @@ EndSection
 Section \"Screen\"
   Identifier \"Screen-vesa\"
   Device \"Device-vesa\"
-EndSection"))))
+EndSection"))
 
   (mlet %store-monad ((xorg-bin    (package-file xorg-server "bin/X"))
                       (dri         (package-file mesa "lib/dri"))
@@ -344,19 +333,17 @@ EndSection"))))
                                         "XKB_BINDIR=" xkbcomp-bin " "
                                         xorg-bin " -ac -logverbose -verbose "
                                         "-xkbdir " xkb-dir " "
-                                        "-config " config " "
+                                        "-config "
+                                        (derivation->output-path config) " "
                                         "-nolisten tcp :0 vt7")))
       (stop  `(make-kill-destructor))
       (respawn? #f)
       (inputs `(("xorg" ,xorg-server)
-                ("mesa" ,mesa)
                 ("xkbcomp" ,xkbcomp)
                 ("xkeyboard-config" ,xkeyboard-config)
-                ("vesa" ,xf86-video-vesa)
-                ("mouse" ,xf86-input-mouse)
-                ("kbd" ,xf86-input-keyboard)
-                ("fonts" ,font-adobe75dpi)
-                ("bash" ,bash)))))))
+                ("mesa" ,mesa)
+                ("bash" ,bash)
+                ("xorg.conf" ,config)))))))
 
 
 (define (dmd-configuration-file services etc)
-- 
cgit 1.4.1