diff options
| author | Timo Wilken | 2023-11-28 22:17:05 +0100 |
|---|---|---|
| committer | Timo Wilken | 2023-11-28 22:17:05 +0100 |
| commit | d5d9951c7675f29931be3ce2a6c79bb6498914d6 (patch) | |
| tree | 2200d5e38b63243ab3a2cc8b43ebc4397ea49397 /tw | |
| parent | 385f51f3fa4b5a0d48d9fbfa124ec92c0b6b393c (diff) | |
Revert to upstream steam-container
The grafted libx11 has been ungrafted, so the package replacement is no longer
needed.
Diffstat (limited to 'tw')
| -rw-r--r-- | tw/home/lap.scm | 2 | ||||
| -rw-r--r-- | tw/packages/games.scm | 29 |
2 files changed, 1 insertions, 30 deletions
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,39 +40,10 @@ #: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 (define-public simutrans |