From 43ee3e1da226ff23849cc33f9d0903c593897c9a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 9 Feb 2023 11:01:24 +0200 Subject: 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. --- gnu/packages/enlightenment.scm | 52 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 4ad8d57868..a08ad05143 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2015 Daniel Pimentel -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Efraim Flashner +;;; Copyright © 2015-2023 Efraim Flashner ;;; Copyright © 2017 Nikita ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Timo Eisenmann @@ -119,27 +119,31 @@ (propagated-inputs ;; All these inputs are in package config files in section ;; Requires.private. - (list dbus - elogind - eudev - fontconfig - freetype - fribidi - glib - harfbuzz - libinput-minimal - libjpeg-turbo - libsndfile - libpng - libunwind - libx11 - libxkbcommon - luajit - lz4 - openssl - pulseaudio - wayland - zlib)) + (append + (list dbus + elogind + eudev + fontconfig + freetype + fribidi + glib + harfbuzz + libinput-minimal + libjpeg-turbo + libsndfile + libpng + libunwind + libx11 + libxkbcommon) + (if (member (%current-system) + (package-transitive-supported-systems luajit)) + (list luajit) + (list lua-5.2)) + (list lz4 + openssl + pulseaudio + wayland + zlib))) (arguments `(#:configure-flags `("-Dembedded-lz4=false" @@ -149,6 +153,10 @@ "-Dmount-path=/run/setuid-programs/mount" "-Dunmount-path=/run/setuid-programs/umount" "-Dnetwork-backend=connman" + ,,@(if (member (%current-system) + (package-transitive-supported-systems luajit)) + `("-Dlua-interpreter=luajit") + `("-Dlua-interpreter=lua")) ;; For Wayland. "-Dwl=true" "-Ddrm=true") -- cgit v1.2.3