diff options
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 4 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index e1d247e8d3..578d4cba71 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -27,7 +27,7 @@ #:use-module ((gnu packages linux) #:select (udev kbd e2fsprogs)) #:use-module ((gnu packages base) - #:select (glibc-final)) + #:select (canonical-package glibc)) #:use-module (gnu packages package-management) #:use-module ((guix build linux-initrd) #:select (mount-flags->bit-mask)) @@ -324,7 +324,7 @@ the ``message of the day''." #:allow-empty-passwords? allow-empty-passwords? #:motd motd))))))) -(define* (nscd-service #:key (glibc glibc-final)) +(define* (nscd-service #:key (glibc (canonical-package glibc))) "Return a service that runs libc's name service cache daemon (nscd)." (with-monad %store-monad (return (service diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index a34129a8ed..9f29e29a40 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -19,7 +19,8 @@ (define-module (gnu services xorg) #:use-module (gnu services) #:use-module (gnu system linux) ; 'pam-service' - #:use-module ((gnu packages base) #:select (guile-final)) + #:use-module ((gnu packages base) #:select (canonical-package)) + #:use-module (gnu packages guile) #:use-module (gnu packages xorg) #:use-module (gnu packages gl) #:use-module (gnu packages slim) @@ -40,7 +41,7 @@ ;;; Code: (define* (xorg-start-command #:key - (guile guile-final) + (guile (canonical-package guile-2.0)) (xorg-server xorg-server)) "Return a derivation that builds a GUILE script to start the X server from XORG-SERVER. Usually the X server is started by a login manager." @@ -89,7 +90,7 @@ EndSection (gexp->script "start-xorg" script))) (define* (xinitrc #:key - (guile guile-final) + (guile (canonical-package guile-2.0)) (ratpoison ratpoison) (windowmaker windowmaker)) "Return a system-wide xinitrc script that starts the specified X session." |