nongnu: Move steam-nvidia and heroic-nvidia to (nongnu packages nvidia).

* nongnu/packages/game-client.scm (steam-container-for, heroic-container-for):
Remove %nvidia-environment-variable-regexps reference.
(steam-nvidia, heroic-nvidia): Move to (nongnu packages nvidia).
* nongnu/packages/nvidia.scm (%nvidia-environment-variable-regexps): Unexport.

2 files changed, 14 insertions, 9 deletions

diff --git a/nongnu/packages/game-client.scm b/nongnu/packages/game-client.scm
index a435ab6..863333c 100644
--- a/nongnu/packages/game-client.scm
+++ b/nongnu/packages/game-client.scm
@@ -243,7 +243,6 @@ implementation with gogdl and Amazon Games using Nile.")
    (packages
     (modify-inputs steam-container-libs
       (replace "mesa" driver)))
-   (preserved-env %nvidia-environment-variable-regexps)
    (link-files '("share"))
    (description "Steam is a digital software distribution platform created by
 Valve.  This package provides a script for launching Steam in a Guix container
@@ -252,10 +251,7 @@ all games will be installed.")))
 
 (define-public steam-for
   (compose nonguix-container->package steam-container-for))
-
 (define-public steam (steam-for mesa))
-(define-public steam-nvidia
-  (package-with-alias "steam-nvidia" (steam-for nvda)))
 
 (define-public (heroic-container-for driver)
   (nonguix-container
@@ -283,7 +279,6 @@ all games will be installed.")))
                  (delete "python"))
                #:name "fhs-union-32"
                #:system "i686-linux"))
-   (preserved-env %nvidia-environment-variable-regexps)
    (link-files '("share"))
    (description "Heroic is an Open Source Game Launcher.  Right now it supports launching
 games from the Epic Games Store using Legendary, GOG Games using our custom
@@ -294,10 +289,7 @@ installed.")))
 
 (define-public heroic-for
   (compose nonguix-container->package heroic-container-for))
-
 (define-public heroic (heroic-for mesa))
-(define-public heroic-nvidia
-  (package-with-alias "heroic-nvidia" (heroic-for nvda)))
 
 (define-public protonup
   (package
diff --git a/nongnu/packages/nvidia.scm b/nongnu/packages/nvidia.scm
index 0e9ad7b..005ac6b 100644
--- a/nongnu/packages/nvidia.scm
+++ b/nongnu/packages/nvidia.scm
@@ -53,13 +53,14 @@
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages xorg)
+  #:use-module (nongnu packages game-client)
   #:use-module (nongnu packages linux)
   #:use-module (nongnu packages video)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-26)
   #:export (replace-mesa))
 
-(define-public %nvidia-environment-variable-regexps
+(define %nvidia-environment-variable-regexps
   '("^__NV_"
     "^__GL_"                            ; NVIDIA OpenGL settings.
     "^__GLX_VENDOR_LIBRARY_NAME$"       ; For GLVND.
@@ -1298,6 +1299,18 @@ support.  For dependency of other packages, use @code{nvidia-driver} instead.")
 ;; 2026-03
 (define-deprecated-package nvdb nvda-beta)
 
+
+;;;
+;;; Package variants for NVIDIA proprietary driver
+;;;
+
+(define-public steam-nvidia
+  (package-with-alias "steam-nvidia" (steam-for nvda)))
+
+(define-public heroic-nvidia
+  (package-with-alias "heroic-nvidia" (heroic-for nvda)))
+
+
 (define* (replace-mesa obj #:key (driver nvda))
   (with-transformation
       (package-input-grafting