Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2025-01-03 12:41:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: steam-client-libs: Rename fontconfig-fixed to fontconfig.

Browse source 
* nongnu/packages/steam-client.scm (steam-client-libs): Rename
fontconfig-fixed to fontconfig.  The upstream bug has not been fixed but expat
has been ungrafted in core-updates so we no longer need to rewrite fontconfig.
Remove fontconfig-fixed as expat/fixed no longer exists in core-updates.
This commit is contained in:
John Kehayias 2023-04-10 21:22:22 -04:00
parent a562bcfbac
commit c6b747700f
No known key found for this signature in database
GPG key ID: 499097AE5EA815D9
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,20 +170,6 @@
(patches (delete (car (search-patches "glibc-dl-cache.patch"))
(origin-patches (package-source glibc))))))))
;; After guix commit to add a replacement for expat (security fixes),
;; https://git.savannah.gnu.org/cgit/guix.git/commit/?id=2045852b096131a714409aa0cc4fe17938f60b15
;; a profile collision happens with the propagated expat (now grafted) from
;; fontconfig. See upstream report https://issues.guix.gnu.org/53406
;; So we define a fontconfig variation that explicitly does the expat replacement
;; which works around this bug for now, at the cost of building fontconfig.
;; TODO: remove once upstream bug is fixed
(define fontconfig-fixed
(package
(inherit fontconfig)
(propagated-inputs
(modify-inputs (package-propagated-inputs fontconfig)
(replace "expat" (@@ (gnu packages xml) expat/fixed))))))
(define fhs-min-libs
`(("glibc" ,glibc-for-fhs)
("glibc-locales" ,glibc-locales)))
@ -195,8 +181,7 @@
("dbus-glib" ,dbus-glib) ; Required for steam browser.
("elfutils" ,elfutils) ; Required for capturing library dependencies in pv.
("eudev" ,eudev) ; Required for steamwebhelper/heavy runtime.
;; TODO: set back to ,fontconfig once https://issues.guix.gnu.org/53406 is fixed
("fontconfig" ,fontconfig-fixed) ; Required for steam client.
("fontconfig" ,fontconfig) ; Required for steam client.
("file" ,file) ; Used for steam installation.
("find" ,findutils) ; Required at least for some logging.
("freetype" ,freetype) ; Required for steam login.