diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2023-11-28 00:55:56 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2023-11-28 00:55:56 -0500 |
| commit | efbe707f8ef835c6224b8d4113ef78296c521d40 (patch) | |
| tree | 80772e1ee20e580f6a665e27a37f8e10c75480ab /nongnu/packages | |
| parent | de0125a78318531cc1b55bd7428698e0b342e912 (diff) | |
nongnu: steam: Return to using mesa.
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.
Diffstat (limited to 'nongnu/packages')
| -rw-r--r-- | nongnu/packages/steam-client.scm | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/nongnu/packages/steam-client.scm b/nongnu/packages/steam-client.scm index e7592cf..f5978d3 100644 --- a/nongnu/packages/steam-client.scm +++ b/nongnu/packages/steam-client.scm @@ -106,28 +106,6 @@ (description "Steam is a digital software distribution platform created by Valve.") (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 `(("bash" ,bash) ; Required for steam startup. ("coreutils" ,coreutils) @@ -151,9 +129,7 @@ ("libvdpau-va-gl" ,libvdpau-va-gl) ; Additional VDPAU support. ("llvm" ,llvm-for-mesa) ; Required for mesa. ("lsof" ,lsof) ; Required for some friend's list actions. - ;; TODO: Set back to mesa once libx11 is ungrafted upstream or once - ;; <https://issues.guix.gnu.org/53406> is fixed. - ("mesa" ,mesa-fixed) ; Required for steam startup. + ("mesa" ,mesa) ; Required for steam startup. ("nss-certs" ,nss-certs) ; Required for steam login. ("pciutils" ,pciutils) ; Tries to run lspci at steam startup. ("procps" ,procps) |