From c323f4c866cdf7c9fb958ed968b80e0911ecd899 Mon Sep 17 00:00:00 2001 From: Elijah Malaby Date: Mon, 29 May 2023 22:39:12 -0600 Subject: nongnu: Export steam containers and minor refactor. nonguix: Make container actually respect the ngc-shared and ngc-exposed fields. * nongnu/packages/steam-client.scm (steam-container): New variable. This is to export the container definition from steam. (steam-nvidia-container): New variable. This is the container for steam-nvidia and now inherits from steam-container. (steam, steam-nvidia): Container definitions moved to steam-container and steam-nvidia-container. * nonguix/multiarch-container.scm (make-container-wrapper): Add ngc-exposed and ngc-shared to expose and share lists. Signed-off-by: ison --- nonguix/multiarch-container.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'nonguix') diff --git a/nonguix/multiarch-container.scm b/nonguix/multiarch-container.scm index 541d6f2..85d36ad 100644 --- a/nonguix/multiarch-container.scm +++ b/nonguix/multiarch-container.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021, 2022 John Kehayias ;;; Copyright © 2023 Giacomo Leidi ;;; Copyright © 2023 Attila Lendvai +;;; Copyright © 2023 Elijah Malaby ;;; The script provided by this package may optionally be started as ;;; a shell instead of automatically launching the wrapped entrypoint by setting @@ -303,7 +304,8 @@ in a sandboxed FHS environment." ,@(exists-> "/sys/class/powercap") ; Needed for power monitoring like MangoHud. "/sys/dev" "/sys/devices" - ,@(exists-> "/var/run/dbus"))) + ,@(exists-> "/var/run/dbus") + #$@(ngc-exposed container))) ;; /dev/hidraw is needed for SteamVR to access the HMD, although here we ;; share all hidraw devices. Instead we could filter to only share specific ;; device. See, for example, this script: @@ -317,7 +319,8 @@ in a sandboxed FHS environment." ,@(exists-> (string-append home "/.config/pulse")) ,@(exists-> (string-append xdg-runtime "/pulse")) ,@(exists-> (string-append xdg-runtime "/bus")) - ,@(exists-> (getenv "XAUTHORITY")))) + ,@(exists-> (getenv "XAUTHORITY")) + #$@(ngc-shared container))) (DEBUG (equal? (getenv "DEBUG") "1")) (args (cdr (command-line))) (command (if DEBUG '() -- cgit v1.2.3