diff options
| author | Mark H Weaver <mhw@netris.org> | 2019-08-29 17:19:18 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2019-08-29 17:19:18 -0400 |
| commit | 0481289cbccba2646bf654f0ae49ac9c45602d5d (patch) | |
| tree | cbe1351e2751e9d22c4c8add02991a3e6674f26a /gnu/services/desktop.scm | |
| parent | c55fae452032aa4b1b63406983e9abdf70adc957 (diff) | |
| parent | 9fbf4d2a52d4d3e01059f3432bb3f78182b5a822 (diff) | |
| download | guix-0481289cbccba2646bf654f0ae49ac9c45602d5d.tar guix-0481289cbccba2646bf654f0ae49ac9c45602d5d.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/services/desktop.scm')
| -rw-r--r-- | gnu/services/desktop.scm | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 343d507c14..a32756e040 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -963,23 +963,29 @@ with the administrator's password." (match-record enlightenment-desktop-configuration <enlightenment-desktop-configuration> (enlightenment) - (list (file-append enlightenment - "/lib/enlightenment/utils/enlightenment_sys") - (file-append enlightenment - "/lib/enlightenment/utils/enlightenment_backlight") - ;; TODO: Move this binary to a screen-locker service. - (file-append enlightenment - "/lib/enlightenment/utils/enlightenment_ckpasswd") - (file-append enlightenment - (string-append - "/lib/enlightenment/modules/cpufreq/" - (match (string-tokenize (%current-system) - (char-set-complement (char-set #\-))) - ((arch "linux") (string-append "linux-gnu-" arch)) - ((arch "gnu") (string-append "gnu-" arch))) - "-" - (version-major+minor (package-version enlightenment)) - "/freqset"))))) + (let ((module-arch (match (string-tokenize (%current-system) + (char-set-complement (char-set #\-))) + ((arch "linux") (string-append "linux-gnu-" arch)) + ((arch "gnu") (string-append "gnu-" arch))))) + (list (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_sys") + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_backlight") + ;; TODO: Move this binary to a screen-locker service. + (file-append enlightenment + "/lib/enlightenment/utils/enlightenment_ckpasswd") + (file-append enlightenment + (string-append + "/lib/enlightenment/modules/cpufreq/" + module-arch "-" + (package-version enlightenment) + "/freqset")) + (file-append enlightenment + (string-append + "/lib/enlightenment/modules/sysinfo/" + module-arch "-" + (package-version enlightenment) + "/cpuclock_sysfs")))))) (define enlightenment-desktop-service-type (service-type |