Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-12-23 15:24:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: steam: Return to using mesa.

Browse source 
With libx11 ungrafted upstream in 5dcbd9accfcf0e97579604f57681c0565ae07ec2 we
no longer need our workaround for mesa.  The upstream bug with grafts is not
fixed, however.

* nongnu/packages/steam-client.scm (steam-client-libs): Rename mesa-fixed to
mesa.
(libxdamage-fixed, mesa-fixed): Remove variables.
This commit is contained in:
John Kehayias 2023-11-28 00:55:56 -05:00
parent de0125a783
commit efbe707f8e
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
nongnu/packages/steam-client.scm
View file

@ -106,28 +106,6 @@
(description "Steam is a digital software distribution platform created by Valve.") (description "Steam is a digital software distribution platform created by Valve.")
(license (license:nonfree "file:///share/doc/steam/steam_subscriber_agreement.txt")))) (license (license:nonfree "file:///share/doc/steam/steam_subscriber_agreement.txt"))))
;; After guix commit to add a replacement for libx11 (security fixes),
;; 5ff0c8997a2ddf71af477883584a5f9ccd9b757f, a profile collision happens with
;; the propagated libx11 (now grafted) from mesa and its propagated-input
;; libxdamage. See previous upstream report (when this occurred for expat and
;; fontconfig) at <https://issues.guix.gnu.org/53406>. So we define explicit
;; replacement packages to workaround this issue.
;; TODO: remove once upstream bug is fixed or libx11 is ungrafted.
(define libxdamage-fixed
(package
(inherit libxdamage)
(propagated-inputs
(modify-inputs (package-propagated-inputs libxdamage)
(replace "libx11" libx11-fixed)))))
(define mesa-fixed
(package
(inherit mesa)
(propagated-inputs
(modify-inputs (package-propagated-inputs mesa)
(replace "libx11" libx11-fixed)
(replace "libxdamage" libxdamage-fixed)))))
(define steam-client-libs (define steam-client-libs
`(("bash" ,bash) ; Required for steam startup. `(("bash" ,bash) ; Required for steam startup.
("coreutils" ,coreutils) ("coreutils" ,coreutils)
@ -151,9 +129,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) ; 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)