diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2020-10-05 14:17:25 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-10-05 14:17:25 +0200 |
| commit | 87c079d9b55afda249ddc1b11798a62547a2cbb6 (patch) | |
| tree | a7a0dbcfd8c3fb8935e00cc44f8b514fa790975b /gnu/packages/enlightenment.scm | |
| parent | de96ed11efdfb450ca45952aceda656a78d981c4 (diff) | |
| parent | 3699ed63501a28629956ca60e198f5fafa57ad4e (diff) | |
| download | guix-patches-87c079d9b55afda249ddc1b11798a62547a2cbb6.tar guix-patches-87c079d9b55afda249ddc1b11798a62547a2cbb6.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/enlightenment.scm')
| -rw-r--r-- | gnu/packages/enlightenment.scm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 004fef5ce5..f63bc20483 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -31,7 +31,6 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages algebra) - #:use-module (gnu packages avahi) #:use-module (gnu packages bittorrent) #:use-module (gnu packages check) #:use-module (gnu packages code) @@ -69,7 +68,7 @@ (define-public efl (package (name "efl") - (version "1.24.3") + (version "1.25.0") (source (origin (method url-fetch) (uri (string-append @@ -77,7 +76,7 @@ version ".tar.xz")) (sha256 (base32 - "0ajwc8lmay5ai7nsrp778g393h0p4h98p4c22gic2w61fgkcd5fy")))) + "0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k")))) (build-system meson-build-system) (native-inputs `(("check" ,check-0.14) @@ -115,8 +114,7 @@ (propagated-inputs ;; All these inputs are in package config files in section ;; Requires.private. - `(("avahi" ,avahi) - ("dbus" ,dbus) + `(("dbus" ,dbus) ("elogind" ,elogind) ("eudev" ,eudev) ("fontconfig" ,fontconfig) @@ -137,13 +135,9 @@ ("wayland" ,wayland) ("zlib" ,zlib))) (arguments - `(#:configure-flags '("-Dsystemd=false" - "-Delogind=true" - "-Dembedded-lz4=false" - "-Devas-loaders-disabler=json" + `(#:configure-flags '("-Dembedded-lz4=false" "-Dbuild-examples=false" "-Decore-imf-loaders-disabler=scim" - "-Davahi=true" "-Dglib=true" "-Dmount-path=/run/setuid-programs/mount" "-Dunmount-path=/run/setuid-programs/umount" @@ -164,6 +158,7 @@ (let ((curl (assoc-ref inputs "curl")) (pulse (assoc-ref inputs "pulseaudio")) (sndfile (assoc-ref inputs "libsndfile")) + (elogind (assoc-ref inputs "elogind")) (lib "/lib/")) (substitute* "src/lib/ecore_con/ecore_con_url_curl.c" (("libcurl.so.?" libcurl) ; libcurl.so.[45] @@ -173,6 +168,9 @@ (string-append pulse lib libpulse)) (("libsndfile.so.1" libsnd) (string-append sndfile lib libsnd))) + (substitute* "src/lib/elput/elput_logind.c" + (("libelogind.so.0" libelogind) + (string-append elogind "/lib/" libelogind))) #t))) (add-after 'unpack 'fix-install-paths (lambda _ @@ -566,19 +564,20 @@ directories. (define-public evisum (package (name "evisum") - (version "0.5.4") + (version "0.5.6") (source (origin (method url-fetch) (uri (string-append "https://download.enlightenment.org/rel/apps/" "evisum/evisum-" version ".tar.xz")) (sha256 - (base32 "1ip3w2d476g45sivqvm1madfyqmkni9q2i99qqxk53859jgs91pa")))) + (base32 "1l8pym7738kncvic5ga03sj9d5igigvmcxa9lbg47z2yvdjwzv97")))) (build-system meson-build-system) (arguments '(#:tests? #f)) ; no tests (native-inputs - `(("pkg-config" ,pkg-config))) + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) (inputs `(("efl" ,efl))) (home-page "https://www.enlightenment.org") |