From 3df1ed128941bc416a59d31d2ca3a9d54c516e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 26 Sep 2020 20:07:52 -0300
Subject: [PATCH 1/2] enlightenment.efl: 1.24.3 -> 1.25.0

- Update version
- Explicitly enable Lua launcher binary support and language bindings,
  as they are now disabled by default
- Remove a patch that has been integrated upstream
- luaL_reg is no longer required (according to Fedora package: https://src.fedoraproject.org/rpms/efl/blob/master/f/efl.spec)
---
 pkgs/desktops/enlightenment/efl/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix
index 9ce0306b549..6c981e9c93b 100644
--- a/pkgs/desktops/enlightenment/efl/default.nix
+++ b/pkgs/desktops/enlightenment/efl/default.nix
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "efl";
-  version = "1.24.3";
+  version = "1.25.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "de95c6e673c170c1e21382918b122417c091c643e7dcaced89aa785529625c2a";
+    sha256 = "0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k";
   };
 
   nativeBuildInputs = [
@@ -142,16 +142,17 @@ stdenv.mkDerivation rec {
     "--buildtype=release"
     "-D build-tests=false" # disable build tests, which are not working
     "-D drm=true"
-    "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs
+    "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disabled by default, scim is not availabe in nixpkgs
     "-D embedded-lz4=false"
     "-D fb=true"
     "-D network-backend=connman"
     "-D sdl=true"
+    "-D elua=true"
+    "-D bindings=lua,cxx"
   ];
 
   patches = [
     ./efl-elua.patch
-    ./0002-efreet-more-stat-info-changes.patch
   ];
 
   postPatch = ''
@@ -174,11 +175,10 @@ stdenv.mkDerivation rec {
     source "$setupHook"
   '';
 
-  NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3
-
   postInstall = ''
     # fix use of $out variable
     substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out"
+    rm "$out/share/elua/core/util.lua.orig"
 
     # add all module include dirs to the Cflags field in efl.pc
     modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done)

From 9c132e34b3ad4b4e386766c972018d358963a4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 26 Sep 2020 20:14:25 -0300
Subject: [PATCH 2/2] pythonPackages.pythonefl: 1.24.0 -> 1.25.0

---
 pkgs/development/python-modules/python-efl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix
index 419b4906487..4e3cffa9d22 100644
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "python-efl";
-  version = "1.24.0";
+  version = "1.25.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz";
-    sha256 = "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy";
+    sha256 = "0bk161xwlz4dlv56r68xwkm8snzfifaxd1j7w2wcyyk4fgvnvq4r";
   };
 
   nativeBuildInputs = [ pkgconfig ];