branch master updated: gnu: efl: Choose lua implementation based on system architecture.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 43ee3e1da2 gnu: efl: Choose lua implementation based on system 
architecture.
43ee3e1da2 is described below

commit 43ee3e1da226ff23849cc33f9d0903c593897c9a
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Feb 9 11:01:24 2023 +0200

    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(-)

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 <sleep_walker@suse.cz>
 ;;; 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 © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
@@ -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")