aboutsummaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-11-20 09:46:15 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-11-20 09:46:57 -0500
commit182ea66f6f158f13c94631a70f5da47426bfb4eb (patch)
tree4b8e32d23ea410b0e83dc1d83db9d33062daa781 /gnu/services
parentb4c727f1e58e908b10bebdbaa3f88adacfd9a744 (diff)
parent0a47ff9f9fe976033001bc1d881917d91f3b90a3 (diff)
downloadguix-182ea66f6f158f13c94631a70f5da47426bfb4eb.tar.gz
guix-182ea66f6f158f13c94631a70f5da47426bfb4eb.zip
Merge branch 'version-1.2.0' into master.
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/base.scm3
-rw-r--r--gnu/services/sddm.scm2
2 files changed, 3 insertions, 2 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 065e89d312..029df5ac16 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -62,7 +62,8 @@
#:use-module (srfi srfi-26)
#:use-module (ice-9 match)
#:use-module (ice-9 format)
- #:re-export (user-processes-service-type) ;backwards compatibility
+ #:re-export (user-processes-service-type ;backwards compatibility
+ %default-substitute-urls)
#:export (fstab-service-type
root-file-system-service
file-system-service-type
diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm
index 59f8b16985..694ad736dc 100644
--- a/gnu/services/sddm.scm
+++ b/gnu/services/sddm.scm
@@ -169,7 +169,7 @@ Relogin=" (if (sddm-configuration-relogin? config)
(list (shepherd-service
(documentation "SDDM display manager.")
- (requirement '(user-processes))
+ (requirement '(user-processes elogind))
(provision '(xorg-server display-manager))
(start #~(make-forkexec-constructor #$sddm-command))
(stop #~(make-kill-destructor)))))