diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
| commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
| tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /gnu/services/desktop.scm | |
| parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
| parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
Diffstat (limited to 'gnu/services/desktop.scm')
| -rw-r--r-- | gnu/services/desktop.scm | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 1294d748ac..16ee4d3537 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2017 ng0 <ng0@n0.is> -;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2018, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net> ;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de> @@ -36,7 +36,7 @@ #:use-module (gnu services networking) #:use-module (gnu services sound) #:use-module ((gnu system file-systems) - #:select (%elogind-file-systems)) + #:select (%elogind-file-systems file-system)) #:use-module (gnu system) #:use-module (gnu system shadow) #:use-module (gnu system pam) @@ -106,6 +106,9 @@ elogind-service elogind-service-type + %fontconfig-file-system + fontconfig-file-system-service + accountsservice-service-type accountsservice-service @@ -797,6 +800,27 @@ when they log out." ;;; +;;; Fontconfig and other desktop file-systems. +;;; + +(define %fontconfig-file-system + (file-system + (device "none") + (mount-point "/var/cache/fontconfig") + (type "tmpfs") + (flags '(read-only)) + (check? #f))) + +;; The global fontconfig cache directory can sometimes contain stale entries, +;; possibly referencing fonts that have been GC'd, so mount it read-only. +;; As mentioned https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36924#8 and +;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=38046#10 and elsewhere. +(define fontconfig-file-system-service + (simple-service 'fontconfig-file-system + file-system-service-type + (list %fontconfig-file-system))) + +;;; ;;; AccountsService service. ;;; @@ -1185,6 +1209,11 @@ or setting its password with passwd."))) ;; perform administrative tasks (similar to "sudo"). polkit-wheel-service + ;; The global fontconfig cache directory can sometimes contain + ;; stale entries, possibly referencing fonts that have been GC'd, + ;; so mount it read-only. + fontconfig-file-system-service + ;; NetworkManager and its applet. (service network-manager-service-type) (service wpa-supplicant-service-type) ;needed by NetworkManager |