From d5d9951c7675f29931be3ce2a6c79bb6498914d6 Mon Sep 17 00:00:00 2001
From: Timo Wilken
Date: Tue, 28 Nov 2023 22:17:05 +0100
Subject: Revert to upstream steam-container

The grafted libx11 has been ungrafted, so the package replacement is no longer
needed.
---
 tw/home/lap.scm       |  2 +-
 tw/packages/games.scm | 29 -----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

(limited to 'tw')

diff --git a/tw/home/lap.scm b/tw/home/lap.scm
index a1b11e42..0013e5a2 100644
--- a/tw/home/lap.scm
+++ b/tw/home/lap.scm
@@ -32,7 +32,7 @@
                 #:select (signal-desktop))
   #:use-module ((nongnu packages nvidia)
                 #:select (nvidia-system-monitor))
-  #:use-module ((tw packages games)   ; (nongnu packages steam-client)
+  #:use-module ((nongnu packages steam-client)
                 #:select (steam-nvidia))
   #:use-module (tw home)
   #:use-module (tw packages mail)
diff --git a/tw/packages/games.scm b/tw/packages/games.scm
index b40590ba..701f983a 100644
--- a/tw/packages/games.scm
+++ b/tw/packages/games.scm
@@ -40,38 +40,9 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix modules)
   #:use-module (guix packages)
-  #:use-module ((nongnu packages nvidia)
-                #:select (nvda))
-  #:use-module ((nongnu packages steam-client)
-                #:select (steam-container))
   #:use-module (nonguix build-system binary)
-  #:use-module ((nonguix multiarch-container)
-                #:select (nonguix-container nonguix-container->package ngc-union32 ngc-union64))
   #:use-module ((nonguix licenses) #:prefix nonguix-license:))
 
-
-;;; Steam
-
-;; TODO: revert to upstream Nonguix' `steam-nvidia-container' once
-;; https://gitlab.com/nonguix/nonguix/-/merge_requests/359 is merged or libx11
-;; is ungrafted in Guix.
-(define replace-mesa*
-  (let* ((mesa-fixed (@@ (nongnu packages steam-client) mesa-fixed))
-         (mesa/nvda (package (inherit mesa) (replacement nvda)))
-         (mesa-fixed/nvda (package (inherit mesa-fixed) (replacement nvda))))
-    (package-input-rewriting
-     `((,mesa . ,mesa/nvda)
-       (,mesa-fixed . ,mesa-fixed/nvda)))))
-
-(define-public steam-nvidia
-  (nonguix-container->package
-   (nonguix-container
-    (inherit steam-container)
-    ;; All .desktop files refer to an executable called "steam".
-    (name "steam")
-    (union64 (replace-mesa* (ngc-union64 steam-container)))
-    (union32 (replace-mesa* (ngc-union32 steam-container))))))
-
 
 ;; Simutrans
 
-- 
cgit v1.2.3