Merge pull request #69026 from romildo/fix.enlightenment
enlightenment.enlightenment: add dependency on bc
This commit is contained in:
commit
457e349423
@ -1,7 +1,7 @@
|
|||||||
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
|
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, alsaLib, bc,
|
||||||
xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
|
bzip2, efl, gdbm, libXdmcp, libXrandr, libcap, libffi,
|
||||||
luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa,
|
libpthreadstubs, libxcb, luajit, mesa, pam, pcre, xcbutilkeysyms,
|
||||||
xkeyboard_config, pcre,
|
xkeyboard_config,
|
||||||
|
|
||||||
bluetoothSupport ? true, bluez5,
|
bluetoothSupport ? true, bluez5,
|
||||||
pulseSupport ? !stdenv.isDarwin, libpulseaudio,
|
pulseSupport ? !stdenv.isDarwin, libpulseaudio,
|
||||||
@ -17,27 +17,28 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
meson
|
|
||||||
ninja
|
|
||||||
(pkgconfig.override { vanilla = true; })
|
(pkgconfig.override { vanilla = true; })
|
||||||
gettext
|
gettext
|
||||||
|
meson
|
||||||
|
ninja
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
alsaLib
|
||||||
|
bc # for the Everything module calculator mode
|
||||||
|
bzip2
|
||||||
efl
|
efl
|
||||||
|
gdbm
|
||||||
libXdmcp
|
libXdmcp
|
||||||
libxcb
|
|
||||||
xcbutilkeysyms
|
|
||||||
libXrandr
|
libXrandr
|
||||||
libffi
|
libffi
|
||||||
pam
|
|
||||||
alsaLib
|
|
||||||
luajit
|
|
||||||
bzip2
|
|
||||||
libpthreadstubs
|
libpthreadstubs
|
||||||
gdbm
|
libxcb
|
||||||
pcre
|
luajit
|
||||||
mesa
|
mesa
|
||||||
|
pam
|
||||||
|
pcre
|
||||||
|
xcbutilkeysyms
|
||||||
xkeyboard_config
|
xkeyboard_config
|
||||||
]
|
]
|
||||||
++ stdenv.lib.optional stdenv.isLinux libcap
|
++ stdenv.lib.optional stdenv.isLinux libcap
|
||||||
@ -68,6 +69,9 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
substituteInPlace src/bin/e_import_config_dialog.c \
|
substituteInPlace src/bin/e_import_config_dialog.c \
|
||||||
--replace "e_prefix_bin_get()" "\"${efl}/bin\""
|
--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" ];
|
mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user