From 15780b518cf6cdb3a0a66d603da7842bd8fcec1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 27 Aug 2018 07:03:44 -0300
Subject: [PATCH 1/3] pythonefl: 1.20.0 -> 1.21.0

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ba335146ce3..941803b22d3f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15649,10 +15649,10 @@ EOF
   # Should be bumped along with EFL!
   pythonefl = buildPythonPackage rec {
     name = "python-efl-${version}";
-    version = "1.20.0";
+    version = "1.21.0";
     src = pkgs.fetchurl {
       url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
-      sha256 = "18qfqdkkjydqjk0nxs7wnnzdnqlbj3fhkjm0bbd927myzbihxpkh";
+      sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47";
     };
 
     hardeningDisable = [ "format" ];

From 4f82d135f7e5875e07a3a7b1d6e9a53a6ff12884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 28 Aug 2018 19:19:48 -0300
Subject: [PATCH 2/3] pythonefl: move out of python-packages.nix

- Move out of pkgs/top-level/python-packages.nix into
pkgs/development/python-modules/python-efl/default.nix.

- Add dependency on dbus-python.

- Remove hardeningDisable.

- Update some meta attributes.
---
 .../python-modules/python-efl/default.nix     | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 +--------------
 2 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/python-efl/default.nix

diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix
new file mode 100644
index 000000000000..b1696a11f77b
--- /dev/null
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, buildPythonPackage, pkgconfig, python, enlightenment }:
+
+# Should be bumped along with EFL!
+
+buildPythonPackage rec {
+  name = "python-efl-${version}";
+  version = "1.21.0";
+
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
+    sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ enlightenment.efl ];
+
+  propagatedBuildInputs = [ python.pkgs.dbus-python ];
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
+  '';
+  
+  preBuild = "${python}/bin/${python.executable} setup.py build_ext";
+
+  installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out";
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python bindings for EFL and Elementary";
+    homepage = https://phab.enlightenment.org/w/projects/python_bindings_for_efl/;
+    platforms = platforms.linux;
+    license = with licenses; [ gpl3 lgpl3 ];
+    maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 941803b22d3f..489f17305178 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15646,35 +15646,7 @@ EOF
   # added 2018-05-23, can be removed once 18.09 is branched off
   udiskie = throw "pythonPackages.udiskie has been replaced by udiskie";
 
-  # Should be bumped along with EFL!
-  pythonefl = buildPythonPackage rec {
-    name = "python-efl-${version}";
-    version = "1.21.0";
-    src = pkgs.fetchurl {
-      url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
-      sha256 = "08x2cv8hnf004c3711250wrax21ffj5y8951pvk77h98als4pq47";
-    };
-
-    hardeningDisable = [ "format" ];
-
-    preConfigure = ''
-      export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
-    '';
-    preBuild = "${python}/bin/${python.executable} setup.py build_ext";
-    installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out";
-
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = with self; [ pkgs.enlightenment.efl ];
-    doCheck = false;
-
-    meta = {
-      description = "Python bindings for EFL and Elementary";
-      homepage = http://enlightenment.org/;
-      platforms = platforms.linux;
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ];
-    };
-  };
+  pythonefl = callPackage ../development/python-modules/python-efl { };
 
   tlsh = buildPythonPackage rec {
     name = "tlsh-3.4.5";

From 4637166ead62c5a0e1c98173a055b53231c5c3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 28 Aug 2018 21:42:30 -0300
Subject: [PATCH 3/3] pythonefl: uses python.interpreter

---
 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 b1696a11f77b..8e3e9d9a5845 100644
--- a/pkgs/development/python-modules/python-efl/default.nix
+++ b/pkgs/development/python-modules/python-efl/default.nix
@@ -21,9 +21,9 @@ buildPythonPackage rec {
     export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
   '';
   
-  preBuild = "${python}/bin/${python.executable} setup.py build_ext";
+  preBuild = "${python.interpreter} setup.py build_ext";
 
-  installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out";
+  installPhase= "${python.interpreter} setup.py install --prefix=$out";
 
   doCheck = false;