Merge branch 'steam-nvidia-beta' into 'master'
nongnu: Add steam-nvidia-beta. See merge request nonguix/nonguix!599
This commit is contained in:
commit
d572c0043f
|
@ -214,6 +214,10 @@ implementation with gogdl and Amazon Games using Nile.")
|
||||||
(modify-inputs steam-container-libs
|
(modify-inputs steam-container-libs
|
||||||
(replace "mesa" nvda)))
|
(replace "mesa" nvda)))
|
||||||
|
|
||||||
|
(define steam-nvidia-container-libs-beta
|
||||||
|
(modify-inputs steam-container-libs
|
||||||
|
(replace "mesa" nvdb)))
|
||||||
|
|
||||||
(define heroic-extra-client-libs
|
(define heroic-extra-client-libs
|
||||||
`(("curl" ,curl) ; Required for Heroic to download e.g. Wine.
|
`(("curl" ,curl) ; Required for Heroic to download e.g. Wine.
|
||||||
("which" ,which) ; Heroic complains about trying to use which (though works).
|
("which" ,which) ; Heroic complains about trying to use which (though works).
|
||||||
|
@ -238,9 +242,20 @@ implementation with gogdl and Amazon Games using Nile.")
|
||||||
#:name "fhs-union-32"
|
#:name "fhs-union-32"
|
||||||
#:system "i686-linux"))))
|
#:system "i686-linux"))))
|
||||||
|
|
||||||
|
(define steam-nvidia-ld.so.conf-beta
|
||||||
|
(packages->ld.so.conf
|
||||||
|
(list (fhs-union steam-nvidia-container-libs-beta
|
||||||
|
#:name "fhs-union-64")
|
||||||
|
(fhs-union steam-nvidia-container-libs-beta
|
||||||
|
#:name "fhs-union-32"
|
||||||
|
#:system "i686-linux"))))
|
||||||
|
|
||||||
(define steam-nvidia-ld.so.cache
|
(define steam-nvidia-ld.so.cache
|
||||||
(ld.so.conf->ld.so.cache steam-nvidia-ld.so.conf))
|
(ld.so.conf->ld.so.cache steam-nvidia-ld.so.conf))
|
||||||
|
|
||||||
|
(define steam-nvidia-ld.so.cache-beta
|
||||||
|
(ld.so.conf->ld.so.cache steam-nvidia-ld.so.conf-beta))
|
||||||
|
|
||||||
(define-public steam-container
|
(define-public steam-container
|
||||||
(nonguix-container
|
(nonguix-container
|
||||||
(name "steam")
|
(name "steam")
|
||||||
|
@ -278,8 +293,24 @@ all games will be installed.")))
|
||||||
#:system "i686-linux"))
|
#:system "i686-linux"))
|
||||||
(preserved-env %nvidia-environment-variable-regexps)))
|
(preserved-env %nvidia-environment-variable-regexps)))
|
||||||
|
|
||||||
|
(define-public steam-nvidia-container-beta
|
||||||
|
(nonguix-container
|
||||||
|
(inherit steam-nvidia-container)
|
||||||
|
(name "steam-nvidia-beta")
|
||||||
|
;; Steam's .desktop files expect a "steam" executable, so provide that.
|
||||||
|
(ld.so.conf steam-nvidia-ld.so.conf-beta)
|
||||||
|
(ld.so.cache steam-nvidia-ld.so.cache-beta)
|
||||||
|
(union64
|
||||||
|
(fhs-union steam-nvidia-container-libs-beta
|
||||||
|
#:name "fhs-union-64"))
|
||||||
|
(union32
|
||||||
|
(fhs-union steam-nvidia-container-libs-beta
|
||||||
|
#:name "fhs-union-32"
|
||||||
|
#:system "i686-linux"))))
|
||||||
|
|
||||||
(define-public steam (nonguix-container->package steam-container))
|
(define-public steam (nonguix-container->package steam-container))
|
||||||
(define-public steam-nvidia (nonguix-container->package steam-nvidia-container))
|
(define-public steam-nvidia (nonguix-container->package steam-nvidia-container))
|
||||||
|
(define-public steam-nvidia-beta (nonguix-container->package steam-nvidia-container-beta))
|
||||||
|
|
||||||
(define-public heroic-container
|
(define-public heroic-container
|
||||||
(nonguix-container
|
(nonguix-container
|
||||||
|
|
|
@ -847,15 +847,17 @@ variables @code{__GLX_VENDOR_LIBRARY_NAME=nvidia} and
|
||||||
(inherit mesa)
|
(inherit mesa)
|
||||||
(replacement nvda)))
|
(replacement nvda)))
|
||||||
|
|
||||||
(define-public mesa/fake-beta
|
(define mesa/fake-beta
|
||||||
(hidden-package
|
(package
|
||||||
(package
|
(inherit mesa)
|
||||||
(inherit mesa)
|
(replacement nvdb)))
|
||||||
(replacement nvdb))))
|
|
||||||
|
|
||||||
(define-public replace-mesa
|
(define-public replace-mesa
|
||||||
(package-input-rewriting `((,mesa . ,mesa/fake))))
|
(package-input-rewriting `((,mesa . ,mesa/fake))))
|
||||||
|
|
||||||
|
(define-public replace-mesa-beta
|
||||||
|
(package-input-rewriting `((,mesa . ,mesa/fake-beta))))
|
||||||
|
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
;;; Other packages
|
;;; Other packages
|
||||||
|
|
Loading…
Reference in New Issue
Block a user