ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-24 19:49:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: efl: Remove input labels.

Browse source 
* gnu/packages/enlightenment.scm (efl) [native-inputs]: Remove labels.
[inputs]: Likewise.
[propagated-inputs]: Likewise.
[arguments]: Use search-input-file.  Only substitute libcurl.so.4, as
libcurl.so.5 does not exist in our curl package.
This commit is contained in:
Maxim Cournoyer 2023-02-07 11:17:02 -05:00
parent 0eed4a9793
commit 31b707cf5d
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 65 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
gnu/packages/enlightenment.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017 Nikita <nikita@n0.is>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de> ;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -82,63 +83,63 @@ (define-public efl
"05bxc58hj0z6pkp6yy5cmy1lc575q0nrbr5lxr6z8d4kznh3my6r")))) "05bxc58hj0z6pkp6yy5cmy1lc575q0nrbr5lxr6z8d4kznh3my6r"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("check" ,check) (list check
("gettext" ,gettext-minimal) gettext-minimal
("pkg-config" ,pkg-config) pkg-config
("python" ,python))) python))
(inputs (inputs
`(("curl" ,curl) (list curl
("giflib" ,giflib) giflib
("gstreamer" ,gstreamer) gstreamer
("gst-plugins-base" ,gst-plugins-base) gst-plugins-base
("ibus-minimal" ,ibus-minimal) ibus-minimal
("mesa" ,mesa) mesa
("libraw" ,libraw) libraw
("librsvg" ,(librsvg-for-system)) (librsvg-for-system)
("libspectre" ,libspectre) libspectre
("libtiff" ,libtiff) libtiff
("libxau" ,libxau) libxau
("libxcomposite" ,libxcomposite) libxcomposite
("libxcursor" ,libxcursor) libxcursor
("libxdamage" ,libxdamage) libxdamage
("libxdmcp" ,libxdmcp) libxdmcp
("libxext" ,libxext) libxext
("libxi" ,libxi) libxi
("libxfixes" ,libxfixes) libxfixes
("libxinerama" ,libxinerama) libxinerama
("libxrandr" ,libxrandr) libxrandr
("libxrender" ,libxrender) libxrender
("libxss" ,libxscrnsaver) libxscrnsaver
("libxtst" ,libxtst) libxtst
("libwebp" ,libwebp) libwebp
("openjpeg" ,openjpeg) openjpeg
("poppler" ,poppler) poppler
("util-linux" ,util-linux "lib") `(,util-linux "lib")
("wayland-protocols" ,wayland-protocols))) wayland-protocols))
(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.
`(("dbus" ,dbus) (list dbus
("elogind" ,elogind) elogind
("eudev" ,eudev) eudev
("fontconfig" ,fontconfig) fontconfig
("freetype" ,freetype) freetype
("fribidi" ,fribidi) fribidi
("glib" ,glib) glib
("harfbuzz" ,harfbuzz) harfbuzz
("libinput" ,libinput-minimal) libinput-minimal
("libjpeg" ,libjpeg-turbo) libjpeg-turbo
("libsndfile" ,libsndfile) libsndfile
("libpng" ,libpng) libpng
("libunwind" ,libunwind) libunwind
("libx11" ,libx11) libx11
("libxkbcommon" ,libxkbcommon) libxkbcommon
("luajit" ,luajit) luajit
("lz4" ,lz4) lz4
("openssl" ,openssl) openssl
("pulseaudio" ,pulseaudio) pulseaudio
("wayland" ,wayland) wayland
("zlib" ,zlib))) zlib))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
`("-Dembedded-lz4=false" `("-Dembedded-lz4=false"
@ -158,22 +159,17 @@ (define-public efl
;; have to wrap the outputs of efl's dependencies in those libraries. ;; have to wrap the outputs of efl's dependencies in those libraries.
(add-after 'unpack 'hardcode-dynamic-libraries (add-after 'unpack 'hardcode-dynamic-libraries
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((curl (assoc-ref inputs "curl")) (substitute* "src/lib/ecore_con/ecore_con_url_curl.c"
(pulse (assoc-ref inputs "pulseaudio")) (("libcurl.so.4")
(sndfile (assoc-ref inputs "libsndfile")) (search-input-file inputs "lib/libcurl.so.4")))
(elogind (assoc-ref inputs "elogind")) (substitute* "src/lib/ecore_audio/ecore_audio.c"
(lib "/lib/")) (("libpulse.so.0")
(substitute* "src/lib/ecore_con/ecore_con_url_curl.c" (search-input-file inputs "lib/libpulse.so.0"))
(("libcurl.so.?" libcurl) ; libcurl.so.[45] (("libsndfile.so.1")
(string-append curl lib libcurl))) (search-input-file inputs "lib/libsndfile.so.1")))
(substitute* "src/lib/ecore_audio/ecore_audio.c" (substitute* "src/lib/elput/elput_logind.c"
(("libpulse.so.0" libpulse) (("libelogind.so.0")
(string-append pulse lib libpulse)) (search-input-file inputs "lib/libelogind.so.0")))))
(("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))))))
(add-after 'unpack 'fix-install-paths (add-after 'unpack 'fix-install-paths
(lambda _ (lambda _
(substitute* "dbus-services/meson.build" (substitute* "dbus-services/meson.build"