nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2014-02-03 23:37:09 +01:00
parent 45adbd624f
commit 7c9325a9ec
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gnu/system/dmd.scm
View File

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