me/guix
Archived
1
0
Fork 0
Code Activity

gnu: efl: Choose lua implementation based on system architecture.

Browse source 
* gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Use luajit or
lua based on the system's luajit support.
[arguments]: Adjust configure-flags to use the correct lua.
This commit is contained in:
Efraim Flashner 2023-02-09 11:01:24 +02:00
parent 8a2c2eaa90
commit 43ee3e1da2
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
gnu/packages/enlightenment.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> ;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org> ;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
;;; 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>
@ -119,27 +119,31 @@
(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.
(list dbus (append
elogind (list dbus
eudev elogind
fontconfig eudev
freetype fontconfig
fribidi freetype
glib fribidi
harfbuzz glib
libinput-minimal harfbuzz
libjpeg-turbo libinput-minimal
libsndfile libjpeg-turbo
libpng libsndfile
libunwind libpng
libx11 libunwind
libxkbcommon libx11
luajit libxkbcommon)
lz4 (if (member (%current-system)
openssl (package-transitive-supported-systems luajit))
pulseaudio (list luajit)
wayland (list lua-5.2))
zlib)) (list lz4
openssl
pulseaudio
wayland
zlib)))
(arguments (arguments
`(#:configure-flags `(#:configure-flags
`("-Dembedded-lz4=false" `("-Dembedded-lz4=false"
@ -149,6 +153,10 @@
"-Dmount-path=/run/setuid-programs/mount" "-Dmount-path=/run/setuid-programs/mount"
"-Dunmount-path=/run/setuid-programs/umount" "-Dunmount-path=/run/setuid-programs/umount"
"-Dnetwork-backend=connman" "-Dnetwork-backend=connman"
,,@(if (member (%current-system)
(package-transitive-supported-systems luajit))
`("-Dlua-interpreter=luajit")
`("-Dlua-interpreter=lua"))
;; For Wayland. ;; For Wayland.
"-Dwl=true" "-Dwl=true"
"-Ddrm=true") "-Ddrm=true")