Compare commits
8 Commits
master
...
steam-upda
Author | SHA1 | Date | |
---|---|---|---|
|
6da06a35b5 | ||
|
6ac2849b56 | ||
|
46c8b08cd6 | ||
|
3da4fa5d28 | ||
|
bc0921a7bc | ||
|
18db7ec1af | ||
|
9e99a4dc6f | ||
|
2ae2326435 |
|
@ -120,13 +120,42 @@
|
||||||
(modify-inputs (package-propagated-inputs libxdamage)
|
(modify-inputs (package-propagated-inputs libxdamage)
|
||||||
(replace "libx11" libx11-fixed)))))
|
(replace "libx11" libx11-fixed)))))
|
||||||
|
|
||||||
(define mesa-fixed
|
(define-public mesa-next
|
||||||
(package
|
(package
|
||||||
(inherit mesa)
|
(inherit mesa)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(modify-inputs (package-propagated-inputs mesa)
|
(modify-inputs (package-propagated-inputs mesa)
|
||||||
(replace "libx11" libx11-fixed)
|
(replace "libx11" libx11-fixed)
|
||||||
(replace "libxdamage" libxdamage-fixed)))))
|
(replace "libxdamage" libxdamage-fixed)))
|
||||||
|
(name "mesa-next")
|
||||||
|
(version "23.2.1")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (list (string-append "https://archive.mesa3d.org/"
|
||||||
|
"mesa-" version ".tar.xz")
|
||||||
|
(string-append "ftp://ftp.freedesktop.org/pub/mesa/"
|
||||||
|
"mesa-" version ".tar.xz")))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1k61pgw0vcjrlb4299q98cy7iqmk2r7jmb5ika91z01dzhb0dpk4"))))))
|
||||||
|
|
||||||
|
(define-public mesa-git
|
||||||
|
(let ((commit "9f4f52f4f3466ba4570f163c869fc1c04b21e5c9")
|
||||||
|
(revision "0"))
|
||||||
|
(package
|
||||||
|
(inherit mesa-next)
|
||||||
|
(name "mesa-git")
|
||||||
|
(version (git-version "23.3.0-devel" revision commit))
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://gitlab.freedesktop.org/mesa/mesa")
|
||||||
|
(commit commit)))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
|
(sha256
|
||||||
|
(base32 "17s2kyf0dsmvi7cnvrmsy39db6j9sba94y34345kqmg4rc2z150a")))))))
|
||||||
|
|
||||||
(define steam-client-libs
|
(define steam-client-libs
|
||||||
`(("bash" ,bash) ; Required for steam startup.
|
`(("bash" ,bash) ; Required for steam startup.
|
||||||
|
@ -151,9 +180,7 @@
|
||||||
("libvdpau-va-gl" ,libvdpau-va-gl) ; Additional VDPAU support.
|
("libvdpau-va-gl" ,libvdpau-va-gl) ; Additional VDPAU support.
|
||||||
("llvm" ,llvm-for-mesa) ; Required for mesa.
|
("llvm" ,llvm-for-mesa) ; Required for mesa.
|
||||||
("lsof" ,lsof) ; Required for some friend's list actions.
|
("lsof" ,lsof) ; Required for some friend's list actions.
|
||||||
;; TODO: Set back to mesa once libx11 is ungrafted upstream or once
|
("mesa" ,mesa-next) ; Required for steam startup.
|
||||||
;; <https://issues.guix.gnu.org/53406> is fixed.
|
|
||||||
("mesa" ,mesa-fixed) ; Required for steam startup.
|
|
||||||
("nss-certs" ,nss-certs) ; Required for steam login.
|
("nss-certs" ,nss-certs) ; Required for steam login.
|
||||||
("pciutils" ,pciutils) ; Tries to run lspci at steam startup.
|
("pciutils" ,pciutils) ; Tries to run lspci at steam startup.
|
||||||
("procps" ,procps)
|
("procps" ,procps)
|
||||||
|
|
|
@ -260,6 +260,19 @@ in a sandboxed FHS environment."
|
||||||
"^DISPLAY$"
|
"^DISPLAY$"
|
||||||
"^DRI_PRIME$"
|
"^DRI_PRIME$"
|
||||||
"^GDK_SCALE$" ; For UI scaling.
|
"^GDK_SCALE$" ; For UI scaling.
|
||||||
|
"^GUIX_LOCPATH$" ; For pressure-vessel locales.
|
||||||
|
;; For startup of added non-Steam games as it
|
||||||
|
;; seems they start in an early environment
|
||||||
|
;; before our additional settings. (Likely
|
||||||
|
;; this can be removed when rewritten to use
|
||||||
|
;; --emulate-fhs from upstream.) Note that
|
||||||
|
;; this is explicitly set below. We could
|
||||||
|
;; preserve what is set before launching the
|
||||||
|
;; container, but any such directories would
|
||||||
|
;; need to be shared with the container as
|
||||||
|
;; well; this is not needed currently.
|
||||||
|
"^LD_LIBRARY_PATH$"
|
||||||
|
"^MANGOHUD" ; For MangoHud configuration.
|
||||||
"^PRESSURE_VESSEL_" ; For pressure vessel options.
|
"^PRESSURE_VESSEL_" ; For pressure vessel options.
|
||||||
"_PROXY$"
|
"_PROXY$"
|
||||||
"_proxy$"
|
"_proxy$"
|
||||||
|
@ -317,14 +330,21 @@ in a sandboxed FHS environment."
|
||||||
,@(exists-> (getenv "XAUTHORITY"))
|
,@(exists-> (getenv "XAUTHORITY"))
|
||||||
#$@(ngc-shared container)))
|
#$@(ngc-shared container)))
|
||||||
(DEBUG (equal? (getenv "DEBUG") "1"))
|
(DEBUG (equal? (getenv "DEBUG") "1"))
|
||||||
|
(extra-shares (if (getenv "GUIX_SANDBOX_EXTRA_SHARES")
|
||||||
|
(string-split (getenv "GUIX_SANDBOX_EXTRA_SHARES") #\:)
|
||||||
|
#f))
|
||||||
(args (cdr (command-line)))
|
(args (cdr (command-line)))
|
||||||
(command (if DEBUG '()
|
(command (if DEBUG '()
|
||||||
`("--" ,run ,@args))))
|
`("--" ,run ,@args))))
|
||||||
;; TODO: Remove once upstream change is merged and in stable pressure-vessel
|
;; Set this so that e.g. non-Steam games added to Steam will launch
|
||||||
;; (although may want to hold off for anyone using older pressure-vessel versions
|
;; properly. It seems otherwise they don't make it to launching
|
||||||
;; for whatever reason), see:
|
;; Steam's pressure-vessel container (for Proton games).
|
||||||
;; https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/merge_requests/406
|
(setenv "LD_LIBRARY_PATH" "/lib64:/lib")
|
||||||
(setenv "PRESSURE_VESSEL_FILESYSTEMS_RO" "/gnu/store")
|
;; Set this so Steam's pressure-vessel container does not need to
|
||||||
|
;; generate locales, improving startup time. This needs to be set to
|
||||||
|
;; the "usual" path, probably so they are included in the
|
||||||
|
;; pressure-vessel container.
|
||||||
|
(setenv "GUIX_LOCPATH" "/usr/lib/locale")
|
||||||
;; By default VDPAU drivers are searched for in libvdpau's store
|
;; By default VDPAU drivers are searched for in libvdpau's store
|
||||||
;; path, so set this path to where the drivers will actually be
|
;; path, so set this path to where the drivers will actually be
|
||||||
;; located in the container.
|
;; located in the container.
|
||||||
|
@ -345,7 +365,9 @@ in a sandboxed FHS environment."
|
||||||
,@(map add-path expose)
|
,@(map add-path expose)
|
||||||
,@(map (lambda (item)
|
,@(map (lambda (item)
|
||||||
(add-path item #:writable? #t))
|
(add-path item #:writable? #t))
|
||||||
share)
|
(if extra-shares
|
||||||
|
(append share extra-shares)
|
||||||
|
share))
|
||||||
"-m" ,manifest-file
|
"-m" ,manifest-file
|
||||||
,@command))))))
|
,@command))))))
|
||||||
|
|
||||||
|
@ -463,6 +485,7 @@ application."
|
||||||
'("/run/current-system/profile/etc"
|
'("/run/current-system/profile/etc"
|
||||||
"/run/current-system/profile/share"
|
"/run/current-system/profile/share"
|
||||||
"/sbin"
|
"/sbin"
|
||||||
|
"/usr/lib"
|
||||||
"/usr/share/vulkan/icd.d"))
|
"/usr/share/vulkan/icd.d"))
|
||||||
(for-each
|
(for-each
|
||||||
new-symlink
|
new-symlink
|
||||||
|
@ -480,6 +503,9 @@ application."
|
||||||
((,union64 "lib") . "/lib64")
|
((,union64 "lib") . "/lib64")
|
||||||
((,union64 "lib") . "/run/current-system/profile/lib64")
|
((,union64 "lib") . "/run/current-system/profile/lib64")
|
||||||
((,union64 "lib/locale") . "/run/current-system/locale")
|
((,union64 "lib/locale") . "/run/current-system/locale")
|
||||||
|
;; Despite using GUIX_LOCPATH, stil need locales in their
|
||||||
|
;; expected location for pressure-vessel to use them.
|
||||||
|
((,union64 "lib/locale") . "/usr/lib/locale")
|
||||||
((,union64 "sbin/ldconfig") . "/sbin/ldconfig")
|
((,union64 "sbin/ldconfig") . "/sbin/ldconfig")
|
||||||
((,union64 "share/mime") . "/usr/share/mime") ; Steam tray icon.
|
((,union64 "share/mime") . "/usr/share/mime") ; Steam tray icon.
|
||||||
((,union64 "share/drirc.d") . "/usr/share/drirc.d")
|
((,union64 "share/drirc.d") . "/usr/share/drirc.d")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user