Merge pull request #69026 from romildo/fix.enlightenment

enlightenment.enlightenment: add dependency on bc
This commit is contained in:
José Romildo Malaquias 2019-09-20 09:39:37 -03:00 committed by GitHub
commit 457e349423
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,7 @@
{ 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, bc,
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 +17,28 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
meson
ninja
(pkgconfig.override { vanilla = true; })
gettext
meson
ninja
];
buildInputs = [
alsaLib
bc # for the Everything module calculator mode
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
@ -68,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" ];