futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: efl: Update to 1.25.0.

Browse Source 
* gnu/packages/enlightenment.scm (efl): Update to 1.25.0.
[propagated-inputs]: Remove avahi.
[arguments]: Remove configure-flags to disable systemd, enable elogind,
list evas-loaders to disable and enable avahi. Add substitution to
hardcode location of elogind's library.
This commit is contained in:
Efraim Flashner 2020-09-23 15:13:40 +03:00
parent 049a1714fc
commit a183bb080f
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/enlightenment.scm
View File

@ -31,7 +31,6 @@
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages avahi)
#:use-module (gnu packages bittorrent) #:use-module (gnu packages bittorrent)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages code) #:use-module (gnu packages code)
@ -69,7 +68,7 @@
(define-public efl (define-public efl
(package (package
(name "efl") (name "efl")
(version "1.24.3") (version "1.25.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -77,7 +76,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0ajwc8lmay5ai7nsrp778g393h0p4h98p4c22gic2w61fgkcd5fy")))) "0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("check" ,check) `(("check" ,check)
@ -115,8 +114,7 @@
(propagated-inputs (propagated-inputs
;; All these inputs are in package config files in section ;; All these inputs are in package config files in section
;; Requires.private. ;; Requires.private.
`(("avahi" ,avahi) `(("dbus" ,dbus)
("dbus" ,dbus)
("elogind" ,elogind) ("elogind" ,elogind)
("eudev" ,eudev) ("eudev" ,eudev)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
@ -137,13 +135,9 @@
("wayland" ,wayland) ("wayland" ,wayland)
("zlib" ,zlib))) ("zlib" ,zlib)))
(arguments (arguments
`(#:configure-flags '("-Dsystemd=false" `(#:configure-flags '("-Dembedded-lz4=false"
"-Delogind=true"
"-Dembedded-lz4=false"
"-Devas-loaders-disabler=json"
"-Dbuild-examples=false" "-Dbuild-examples=false"
"-Decore-imf-loaders-disabler=scim" "-Decore-imf-loaders-disabler=scim"
"-Davahi=true"
"-Dglib=true" "-Dglib=true"
"-Dmount-path=/run/setuid-programs/mount" "-Dmount-path=/run/setuid-programs/mount"
"-Dunmount-path=/run/setuid-programs/umount" "-Dunmount-path=/run/setuid-programs/umount"
@ -164,6 +158,7 @@
(let ((curl (assoc-ref inputs "curl")) (let ((curl (assoc-ref inputs "curl"))
(pulse (assoc-ref inputs "pulseaudio")) (pulse (assoc-ref inputs "pulseaudio"))
(sndfile (assoc-ref inputs "libsndfile")) (sndfile (assoc-ref inputs "libsndfile"))
(elogind (assoc-ref inputs "elogind"))
(lib "/lib/")) (lib "/lib/"))
(substitute* "src/lib/ecore_con/ecore_con_url_curl.c" (substitute* "src/lib/ecore_con/ecore_con_url_curl.c"
(("libcurl.so.?" libcurl) ; libcurl.so.[45] (("libcurl.so.?" libcurl) ; libcurl.so.[45]
@ -173,6 +168,9 @@
(string-append pulse lib libpulse)) (string-append pulse lib libpulse))
(("libsndfile.so.1" libsnd) (("libsndfile.so.1" libsnd)
(string-append sndfile lib libsnd))) (string-append sndfile lib libsnd)))
(substitute* "src/lib/elput/elput_logind.c"
(("libelogind.so.0" libelogind)
(string-append elogind "/lib/" libelogind)))
#t))) #t)))
(add-after 'unpack 'fix-install-paths (add-after 'unpack 'fix-install-paths
(lambda _ (lambda _