From 75d88e42b6049af69375379fac52fb994c2e0ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 18 Sep 2019 10:36:58 -0300
Subject: [PATCH 1/2] enlightenment.enlightenment: alphabetize dependence list

---
 pkgs/desktops/enlightenment/enlightenment.nix | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index b2a9d398709..5b80a161d0c 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
-  xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
-  luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa,
-  xkeyboard_config, pcre,
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bzip2,
+  efl, gdbm, libXdmcp, libXrandr, libcap, libffi, libpthreadstubs,
+  libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms, xkeyboard_config,
 
   bluetoothSupport ? true, bluez5,
   pulseSupport ? !stdenv.isDarwin, libpulseaudio,
@@ -17,27 +16,27 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    meson
-    ninja
     (pkgconfig.override { vanilla = true; })
     gettext
+    meson
+    ninja
   ];
 
   buildInputs = [
+    alsaLib
+    bzip2
     efl
+    gdbm
     libXdmcp
-    libxcb
-    xcbutilkeysyms
     libXrandr
     libffi
-    pam
-    alsaLib
-    luajit
-    bzip2
     libpthreadstubs
-    gdbm
-    pcre
+    libxcb
+    luajit
     mesa
+    pam
+    pcre
+    xcbutilkeysyms
     xkeyboard_config
   ]
   ++ stdenv.lib.optional stdenv.isLinux libcap

From cfc7a32966dc6cabd925fdc84d082cfc9067b576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 18 Sep 2019 11:28:49 -0300
Subject: [PATCH 2/2] enlightenment.enlightenment: add dependency on bc

---
 pkgs/desktops/enlightenment/enlightenment.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 5b80a161d0c..a5724385e41 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bzip2,
-  efl, gdbm, libXdmcp, libXrandr, libcap, libffi, libpthreadstubs,
-  libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms, xkeyboard_config,
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bc,
+  bzip2, efl, gdbm, libXdmcp, libXrandr, libcap, libffi,
+  libpthreadstubs, libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms,
+  xkeyboard_config,
 
   bluetoothSupport ? true, bluez5,
   pulseSupport ? !stdenv.isDarwin, libpulseaudio,
@@ -24,6 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     alsaLib
+    bc  # for the Everything module calculator mode
     bzip2
     efl
     gdbm
@@ -67,6 +69,9 @@ stdenv.mkDerivation rec {
 
     substituteInPlace src/bin/e_import_config_dialog.c \
       --replace "e_prefix_bin_get()" "\"${efl}/bin\""
+
+    substituteInPlace src/modules/everything/evry_plug_calc.c \
+      --replace "ecore_exe_pipe_run(\"bc -l\"" "ecore_exe_pipe_run(\"${bc}/bin/bc -l\""
   '';
 
   mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ];