me/guix
Archived
1
0
Fork 0
Code Activity

gnu: efl: Only conditionally enable the optional SVG support.

Browse source 
* gnu/packages/enlightenment.scm (efl)[inputs]
{librsvg}: Only provide it when the target is x86_64.
[configure-flags]: Remove dead code.  Conditionally disable the 'rsvg' loader
via the 'evas-loaders-disabler' flag.
This commit is contained in:
Maxim Cournoyer 2021-11-25 15:44:35 -05:00
parent 0702bbe1f7
commit 0df12a32bb
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gnu/packages/enlightenment.scm
View file

@ -92,7 +92,11 @@
("ibus" ,ibus) ("ibus" ,ibus)
("mesa" ,mesa) ("mesa" ,mesa)
("libraw" ,libraw) ("libraw" ,libraw)
("librsvg" ,librsvg) ;; Only enable the optional SVG support on x86_64, as this is the only
;; architecture where librsvg can be built.
,@(if (target-x86-64?)
`(("librsvg" ,librsvg))
'())
("libspectre" ,libspectre) ("libspectre" ,libspectre)
("libtiff" ,libtiff) ("libtiff" ,libtiff)
("libxau" ,libxau) ("libxau" ,libxau)
@ -138,20 +142,23 @@
("wayland" ,wayland) ("wayland" ,wayland)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:configure-flags '("-Dembedded-lz4=false" `(#:configure-flags
"-Dbuild-examples=false" `("-Dembedded-lz4=false"
"-Decore-imf-loaders-disabler=scim" "-Dbuild-examples=false"
"-Dglib=true" "-Decore-imf-loaders-disabler=scim"
"-Dmount-path=/run/setuid-programs/mount" "-Dglib=true"
"-Dunmount-path=/run/setuid-programs/umount" "-Dmount-path=/run/setuid-programs/mount"
;(string-append "-Ddictionaries-hyphen-dir=" "-Dunmount-path=/run/setuid-programs/umount"
; (assoc-ref %build-inputs "hyphen") "-Dnetwork-backend=connman"
; "/share/hyphen") ;; Add 'rsvg' to the default list (json and avif) of disabled loaders
"-Dnetwork-backend=connman" ;; unless librsvg is available.
;; for wayland ,,@(if (target-x86-64?)
"-Dwl=true" '()
"-Ddrm=true") (list "-Devas-loaders-disabler=json,avif,rsvg"))
#:tests? #f ; Many tests fail due to timeouts and network requests. ;; For Wayland.
"-Dwl=true"
"-Ddrm=true")
#:tests? #f ; Many tests fail due to timeouts and network requests.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; If we don't hardcode the location of libcurl.so and others then we ;; If we don't hardcode the location of libcurl.so and others then we