Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-12-23 15:24:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: steam: Audio and D-Bus fixes.

Browse source 
* nongnu/packages/steam-client.scm (make-container-wrapper):
Remove the UID variable in favor of XDG_RUNTIME_DIR for dbus and pulse sockets.
Preserve the DBUS_SESSION_BUS_ADDRESS environment variable.

Signed-off-by: ison <ison@airmail.cc>
This commit is contained in:
pineapples 2021-03-05 11:40:43 -07:00 committed by ison
parent 1404b00a49
commit a31cd4a5ec
No known key found for this signature in database
GPG key ID: 5E76B1AD0FC22F93
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nongnu/packages/steam-client.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 pkill-9 ;;; Copyright © 2020 pkill-9
;;; Copyright © 2020, 2021 ison <ison@airmail.cc> ;;; Copyright © 2020, 2021 ison <ison@airmail.cc>
;;; Copyright © 2021 pineapples
;;; ;;;
;;; This file is not part of GNU Guix. ;;; This file is not part of GNU Guix.
;;; ;;;
@ -311,12 +312,13 @@ in a sandboxed FHS environment."
(define (exists-> file) (define (exists-> file)
(if (and file (file-exists? file)) (if (and file (file-exists? file))
`(,file) '())) `(,file) '()))
(let* ((UID (number->string (passwd:uid (getpwnam (getenv "USER"))))) (let* ((run #$(file-append fhs-internal "/bin/" (ngc-internal-name container)))
(run #$(file-append fhs-internal "/bin/" (ngc-internal-name container)))
(manifest-file #$(file-append fhs-manifest)) (manifest-file #$(file-append fhs-manifest))
(xdg-runtime (getenv "XDG_RUNTIME_DIR"))
(home (getenv "HOME")) (home (getenv "HOME"))
(sandbox-home (string-append home "/" #$(ngc-sandbox-home container))) (sandbox-home (string-append home "/" #$(ngc-sandbox-home container)))
(preserved-env '("DISPLAY" (preserved-env '("DBUS_SESSION_BUS_ADDRESS"
"DISPLAY"
"DRI_PRIME" "DRI_PRIME"
"SDL_AUDIODRIVER" "SDL_AUDIODRIVER"
"STEAM_RUNTIME" "STEAM_RUNTIME"
@ -335,8 +337,8 @@ in a sandboxed FHS environment."
(share `("/dev/shm" (share `("/dev/shm"
,(string-append sandbox-home "=" home) ,(string-append sandbox-home "=" home)
,@(exists-> (string-append home "/.config/pulse")) ,@(exists-> (string-append home "/.config/pulse"))
,@(exists-> (string-append "/run/user/" UID "/pulse")) ,@(exists-> (string-append xdg-runtime "/pulse"))
,@(exists-> (string-append "/run/user/" UID "/bus")) ,@(exists-> (string-append xdg-runtime "/bus"))
,@(exists-> (getenv "XAUTHORITY")))) ,@(exists-> (getenv "XAUTHORITY"))))
(DEBUG (equal? (getenv "DEBUG") "1")) (DEBUG (equal? (getenv "DEBUG") "1"))
(args (cdr (command-line))) (args (cdr (command-line)))