summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2023-02-09 11:01:24 +0200
committerEfraim Flashner <efraim@flashner.co.il>2023-02-09 11:03:31 +0200
commit43ee3e1da226ff23849cc33f9d0903c593897c9a (patch)
tree2a818448f452a8332dd6a4378cd18d34d6a37661
parent8a2c2eaa906bd12d9c804ba18ac305b9719507ef (diff)
gnu: efl: Choose lua implementation based on system architecture.
* 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.
-rw-r--r--gnu/packages/enlightenment.scm52
1 files changed, 30 insertions, 22 deletions
diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm
index 4ad8d578688..a08ad051434 100644
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@ -1,7 +1,7 @@
1;;; GNU Guix --- Functional package management for GNU 1;;; GNU Guix --- Functional package management for GNU
2;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz> 2;;; Copyright © 2015 Tomáš Čech <sleep_walker@suse.cz>
3;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org> 3;;; Copyright © 2015 Daniel Pimentel <d4n1@member.fsf.org>
4;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> 4;;; Copyright © 2015-2023 Efraim Flashner <efraim@flashner.co.il>
5;;; Copyright © 2017 Nikita <nikita@n0.is> 5;;; Copyright © 2017 Nikita <nikita@n0.is>
6;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> 6;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
7;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de> 7;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
@@ -119,27 +119,31 @@
119 (propagated-inputs 119 (propagated-inputs
120 ;; All these inputs are in package config files in section 120 ;; All these inputs are in package config files in section
121 ;; Requires.private. 121 ;; Requires.private.
122 (list dbus 122 (append
123 elogind 123 (list dbus
124 eudev 124 elogind
125 fontconfig 125 eudev
126 freetype 126 fontconfig
127 fribidi 127 freetype
128 glib 128 fribidi
129 harfbuzz 129 glib
130 libinput-minimal 130 harfbuzz
131 libjpeg-turbo 131 libinput-minimal
132 libsndfile 132 libjpeg-turbo
133 libpng 133 libsndfile
134 libunwind 134 libpng
135 libx11 135 libunwind
136 libxkbcommon 136 libx11
137 luajit 137 libxkbcommon)
138 lz4 138 (if (member (%current-system)
139 openssl 139 (package-transitive-supported-systems luajit))
140 pulseaudio 140 (list luajit)
141 wayland 141 (list lua-5.2))
142 zlib)) 142 (list lz4
143 openssl
144 pulseaudio
145 wayland
146 zlib)))
143 (arguments 147 (arguments
144 `(#:configure-flags 148 `(#:configure-flags
145 `("-Dembedded-lz4=false" 149 `("-Dembedded-lz4=false"
@@ -149,6 +153,10 @@
149 "-Dmount-path=/run/setuid-programs/mount" 153 "-Dmount-path=/run/setuid-programs/mount"
150 "-Dunmount-path=/run/setuid-programs/umount" 154 "-Dunmount-path=/run/setuid-programs/umount"
151 "-Dnetwork-backend=connman" 155 "-Dnetwork-backend=connman"
156 ,,@(if (member (%current-system)
157 (package-transitive-supported-systems luajit))
158 `("-Dlua-interpreter=luajit")
159 `("-Dlua-interpreter=lua"))
152 ;; For Wayland. 160 ;; For Wayland.
153 "-Dwl=true" 161 "-Dwl=true"
154 "-Ddrm=true") 162 "-Ddrm=true")