From c323f4c866cdf7c9fb958ed968b80e0911ecd899 Mon Sep 17 00:00:00 2001
From: Elijah Malaby <qwe12345678910@gmail.com>
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 <ison@airmail.cc>
---
 nongnu/packages/steam-client.scm | 82 ++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 50 deletions(-)

(limited to 'nongnu/packages/steam-client.scm')

diff --git a/nongnu/packages/steam-client.scm b/nongnu/packages/steam-client.scm
index f3cb184..b8c8de3 100644
--- a/nongnu/packages/steam-client.scm
+++ b/nongnu/packages/steam-client.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2021 Kozo <kozodev@runbox.com>
 ;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
+;;; Copyright © 2023 Elijah Malaby
 
 (define-module (nongnu packages steam-client)
   #:use-module ((guix licenses) #:prefix license:)
@@ -163,59 +164,40 @@
 (define steam-ld.so.cache
   (ld.so.conf->ld.so.cache steam-ld.so.conf))
 
-(define-public steam
-  (nonguix-container->package
-   (nonguix-container
-    (name "steam")
-    (wrap-package steam-client)
-    (run "/bin/steam")
-    (ld.so.conf steam-ld.so.conf)
-    (ld.so.cache steam-ld.so.cache)
-    (union64
-     (fhs-union `(,@steam-client-libs
-                  ,@steam-gameruntime-libs
-                  ,@fhs-min-libs)
-                #:name "fhs-union-64"))
-    (union32
-     (fhs-union `(,@steam-client-libs
-                  ,@steam-gameruntime-libs
-                  ,@fhs-min-libs)
-                #:name "fhs-union-32"
-                #:system "i686-linux"))
-    (link-files '("share/applications/steam.desktop"
-                  "share/applications/steam-asound32.desktop"))
-    (description "Steam is a digital software distribution platform created by
+(define-public steam-container
+  (nonguix-container
+   (name "steam")
+   (wrap-package steam-client)
+   (run "/bin/steam")
+   (ld.so.conf steam-ld.so.conf)
+   (ld.so.cache steam-ld.so.cache)
+   (union64
+    (fhs-union `(,@steam-client-libs
+                 ,@steam-gameruntime-libs
+                 ,@fhs-min-libs)
+               #:name "fhs-union-64"))
+   (union32
+    (fhs-union `(,@steam-client-libs
+                 ,@steam-gameruntime-libs
+                 ,@fhs-min-libs)
+               #:name "fhs-union-32"
+               #:system "i686-linux"))
+   (link-files '("share/applications/steam.desktop"
+                 "share/applications/steam-asound32.desktop"))
+   (description "Steam is a digital software distribution platform created by
 Valve.  This package provides a script for launching Steam in a Guix container
 which will use the directory @file{$HOME/.local/share/guix-sandbox-home} where
-all games will be installed."))))
+all games will be installed.")))
 
-(define-public steam-nvidia
-  (nonguix-container->package
-   (nonguix-container
-    (name "steam-nvidia")
-    (wrap-package steam-client)
-    (run "/bin/steam")
-    (ld.so.conf steam-ld.so.conf)
-    (ld.so.cache steam-ld.so.cache)
-    (union64
-     (replace-mesa
-      (fhs-union `(,@steam-client-libs
-                  ,@steam-gameruntime-libs
-                  ,@fhs-min-libs)
-                #:name "fhs-union-64")))
-    (union32
-     (replace-mesa
-      (fhs-union `(,@steam-client-libs
-                  ,@steam-gameruntime-libs
-                  ,@fhs-min-libs)
-                #:name "fhs-union-32"
-                #:system "i686-linux")))
-    (link-files '("share/applications/steam.desktop"
-                  "share/applications/steam-asound32.desktop"))
-    (description "Steam is a digital software distribution platform created by
-Valve.  This package provides a script for launching Steam in a Guix container
-which will use the directory @file{$HOME/.local/share/guix-sandbox-home} where
-all games will be installed."))))
+(define-public steam-nvidia-container
+  (nonguix-container
+   (inherit steam-container)
+   (name "steam-nvidia")
+   (union64 (replace-mesa (ngc-union64 steam-container)))
+   (union32 (replace-mesa (ngc-union32 steam-container)))))
+
+(define-public steam (nonguix-container->package steam-container))
+(define-public steam-nvidia (nonguix-container->package steam-nvidia-container))
 
 (define-public protonup-ng
   (package
-- 
cgit v1.2.3