diff options
| author | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
|---|---|---|
| committer | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
| commit | 8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb (patch) | |
| tree | 7177d90f3a8f0ba34630e78b5516dbda68ff0570 /gnu/services | |
| parent | 404e3d8b1bcd92ad934711fe759feb220f4d1c60 (diff) | |
| parent | 484a72a036e6a8af43f517d6547446f3de344a07 (diff) | |
Merge 'master' into core-updates
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 6 | ||||
| -rw-r--r-- | gnu/services/desktop.scm | 16 |
2 files changed, 16 insertions, 6 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 64620a9b0a8..541ca76f148 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -307,7 +307,8 @@ FILE-SYSTEM." '#$packages)))) (lambda () (mount-file-system - '#$(file-system->spec file-system) + (spec->file-system + '#$(file-system->spec file-system)) #:root "/")) (lambda () (setenv "PATH" $PATH))) @@ -322,9 +323,10 @@ FILE-SYSTEM." (umount #$target) #f)) - ;; We need an additional module. + ;; We need additional modules. (modules `(((gnu build file-systems) #:select (mount-file-system)) + (gnu system file-systems) ,@%default-modules))))))) (define (file-system-shepherd-services file-systems) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 527a3101cf8..4b5100c27ac 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -780,15 +780,23 @@ accountsservice web site} for more information." gnome-desktop-configuration (gnome-package gnome-package (default gnome))) +(define (gnome-polkit-settings config) + "Return the list of GNOME dependencies that provide polkit actions and +rules." + (let ((gnome (gnome-package config))) + (map (lambda (name) + ((package-direct-input-selector name) gnome)) + '("gnome-settings-daemon" + "gnome-control-center" + "gnome-system-monitor" + "gvfs")))) + (define gnome-desktop-service-type (service-type (name 'gnome-desktop) (extensions (list (service-extension polkit-service-type - (compose list - (package-direct-input-selector - "gnome-settings-daemon") - gnome-package)) + gnome-polkit-settings) (service-extension profile-service-type (compose list gnome-package)))))) |