diff options
Diffstat (limited to 'modules/freya/services/pipewire.scm')
| -rw-r--r-- | modules/freya/services/pipewire.scm | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/modules/freya/services/pipewire.scm b/modules/freya/services/pipewire.scm index ccc71a3..adc5963 100644 --- a/modules/freya/services/pipewire.scm +++ b/modules/freya/services/pipewire.scm @@ -5,12 +5,14 @@ #:use-module (gnu services configuration) #:use-module (gnu home services) #:use-module (gnu home services shepherd) + #:use-module (freya packages linux) + #:use-module (freya packages networking) #:use-module (guix gexp)) (define (home-pipewire-profile-service config) - (map specification->package - (list "pipewire" - "wireplumber"))) + (list pipewire-new + wireplumber-new)) + (define (home-pipewire-shepherd-service config) (list @@ -20,7 +22,7 @@ (provision '(pipewire)) (stop #~(make-kill-destructor)) (start #~(make-forkexec-constructor - (list #$(file-append pipewire "/bin/pipewire")) + (list #$(file-append pipewire-new "/bin/pipewire")) #:log-file (string-append (or (getenv "XDG_LOG_HOME") (format #f "~a/.local/var/log" @@ -35,7 +37,7 @@ (provision '(pipewire-pulse)) (stop #~(make-kill-destructor)) (start #~(make-forkexec-constructor - (list #$(file-append pipewire "/bin/pipewire-pulse")) + (list #$(file-append pipewire-new "/bin/pipewire-pulse")) #:log-file (string-append (or (getenv "XDG_LOG_HOME") (format #f "~a/.local/var/log" @@ -50,7 +52,7 @@ (provision '(wireplumber)) (stop #~(make-kill-destructor)) (start #~(make-forkexec-constructor - (list #$(file-append wireplumber "/bin/wireplumber")) + (list #$(file-append wireplumber-new "/bin/wireplumber")) #:log-file (string-append (or (getenv "XDG_LOG_HOME") (format #f "~a/.local/var/log" @@ -67,18 +69,18 @@ #~(string-append "<" #$(file-append - pipewire "/share/alsa/alsa.conf.d/50-pipewire.conf") + pipewire-new "/share/alsa/alsa.conf.d/50-pipewire.conf") ">\n<" #$(file-append - pipewire "/share/alsa/alsa.conf.d/99-pipewire-default.conf") + pipewire-new "/share/alsa/alsa.conf.d/99-pipewire-default.conf") ">\n" " pcm_type.pipewire { - lib " #$(file-append pipewire "/lib/alsa-lib/libasound_module_pcm_pipewire.so") + lib " #$(file-append pipewire-new "/lib/alsa-lib/libasound_module_pcm_pipewire.so") " } ctl_type.pipewire { - lib " #$(file-append pipewire "/lib/alsa-lib/libasound_module_ctl_pipewire.so") + lib " #$(file-append pipewire-new "/lib/alsa-lib/libasound_module_ctl_pipewire.so") " } "))))) |