@@ -1,7 +1,7 @@
1−{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
2− xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
3− luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa,
4− xkeyboard_config, pcre,
1+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bc,
2+ bzip2, efl, gdbm, libXdmcp, libXrandr, libcap, libffi,
3+ libpthreadstubs, libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms,
4+ xkeyboard_config,
55
66 bluetoothSupport ? true, bluez5,
77 pulseSupport ? !stdenv.isDarwin, libpulseaudio,
@@ -17,27 +17,28 @@ stdenv.mkDerivation rec {
1717 };
1818
1919 nativeBuildInputs = [
20− meson
21− ninja
2220 (pkgconfig.override { vanilla = true; })
2321 gettext
22+ meson
23+ ninja
2424 ];
2525
2626 buildInputs = [
27+ alsaLib
28+ bc # for the Everything module calculator mode
29+ bzip2
2730 efl
31+ gdbm
2832 libXdmcp
29− libxcb
30− xcbutilkeysyms
3133 libXrandr
3234 libffi
33− pam
34− alsaLib
35− luajit
36− bzip2
3735 libpthreadstubs
38− gdbm
39− pcre
36+ libxcb
37+ luajit
4038 mesa
39+ pam
40+ pcre
41+ xcbutilkeysyms
4142 xkeyboard_config
4243 ]
4344 ++ stdenv.lib.optional stdenv.isLinux libcap
@@ -68,6 +69,9 @@ stdenv.mkDerivation rec {
6869
6970 substituteInPlace src/bin/e_import_config_dialog.c \
7071 --replace "e_prefix_bin_get()" "\"${efl}/bin\""
72+
73+ substituteInPlace src/modules/everything/evry_plug_calc.c \
74+ --replace "ecore_exe_pipe_run(\"bc -l\"" "ecore_exe_pipe_run(\"${bc}/bin/bc -l\""
7175 '';
7276
7377 mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ];