diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-10-21 00:33:43 +0200 |
commit | 023522d3a1e81fe9bc803183337fdc8c183a88c4 (patch) | |
tree | ec374744812891a627f33fa457b0bcf083e2c142 /gnu/services/desktop.scm | |
parent | 07abc851ce8a580253061e065b31a4037d2f965d (diff) | |
parent | 7373eb8304e0ebbfabe66deb59e78187013403dd (diff) | |
download | guix-023522d3a1e81fe9bc803183337fdc8c183a88c4.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services/desktop.scm')
-rw-r--r-- | gnu/services/desktop.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index a32756e040..5a7f8be4bb 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> +;;; Copyright © 2019 David Wilson <david@daviwil.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -907,15 +908,21 @@ and extends polkit with the actions from @code{mate-settings-daemon}." xfce-desktop-configuration (xfce xfce-package (default xfce))) +(define (xfce-polkit-settings config) + "Return the list of XFCE dependencies that provide polkit actions and +rules." + (let ((xfce (xfce-package config))) + (map (lambda (name) + ((package-direct-input-selector name) xfce)) + '("thunar" + "xfce4-power-manager")))) + (define xfce-desktop-service-type (service-type (name 'xfce-desktop) (extensions (list (service-extension polkit-service-type - (compose list - (package-direct-input-selector - "thunar") - xfce-package)) + xfce-polkit-settings) (service-extension profile-service-type (compose list xfce-package)))) (default-value (xfce-desktop-configuration)) |