diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-09-03 17:12:38 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-09-10 19:46:13 -0400 |
| commit | 4307c476c407982ee80e6aa2de4a7e2209789912 (patch) | |
| tree | 185a9dcf651250a7c688ffe74722c0fa71b69d8c /gnu/services/desktop.scm | |
| parent | 14454f0bc55326897feffec9496d61d0fd1da8cb (diff) | |
| download | patches-4307c476c407982ee80e6aa2de4a7e2209789912.tar patches-4307c476c407982ee80e6aa2de4a7e2209789912.tar.gz | |
services: Add udev rules for (upower colord elogind) to %desktop-services.
* gnu/services/desktop.scm (%desktop-services): Replace the 'udev-service'
from %base-services.
* gnu/services/base.scm (%base-services): Add a comment to keep them in sync.
Diffstat (limited to 'gnu/services/desktop.scm')
| -rw-r--r-- | gnu/services/desktop.scm | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 1bf3db053b..6017449194 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com> +;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,8 @@ #:use-module (gnu packages avahi) #:use-module (gnu packages wicd) #:use-module (gnu packages polkit) + #:use-module ((gnu packages linux) + #:select (lvm2 fuse alsa-utils crda)) #:use-module (guix monads) #:use-module (guix records) #:use-module (guix store) @@ -593,12 +596,24 @@ when they log out." (ntp-service) (map (lambda (mservice) - ;; Provide an nscd ready to use nss-mdns. (mlet %store-monad ((service mservice)) - (if (memq 'nscd (service-provision service)) - (nscd-service (nscd-configuration) - #:name-services (list nss-mdns)) - mservice))) + (cond + ;; Provide an nscd ready to use nss-mdns. + ((memq 'nscd (service-provision service)) + (nscd-service (nscd-configuration) + #:name-services (list nss-mdns))) + + ;; Add more rules to udev-service. + ;; + ;; XXX Keep this in sync with the 'udev-service' call in + ;; %base-services. Here we intend only to add 'upower', + ;; 'colord', and 'elogind'. + ((memq 'udev (service-provision service)) + (udev-service #:rules + (list lvm2 fuse alsa-utils crda + upower colord elogind))) + + (else mservice)))) %base-services))) ;;; desktop.scm ends here |