diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2019-09-20 09:39:37 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-20 09:39:37 -0300 |
| commit | 457e349423cf087612a0aa1e59b84772ebcfab98 (patch) | |
| tree | 7248256b78932575a62616a010893554c1eb729a /pkgs | |
| parent | 44755866216a07b076f45d000116f95b93d12424 (diff) | |
| parent | cfc7a32966dc6cabd925fdc84d082cfc9067b576 (diff) | |
| download | nixpkgs-457e349423cf087612a0aa1e59b84772ebcfab98.tar nixpkgs-457e349423cf087612a0aa1e59b84772ebcfab98.tar.gz nixpkgs-457e349423cf087612a0aa1e59b84772ebcfab98.tar.bz2 nixpkgs-457e349423cf087612a0aa1e59b84772ebcfab98.tar.lz nixpkgs-457e349423cf087612a0aa1e59b84772ebcfab98.tar.xz nixpkgs-457e349423cf087612a0aa1e59b84772ebcfab98.tar.zst nixpkgs-457e349423cf087612a0aa1e59b84772ebcfab98.zip | |
Merge pull request #69026 from romildo/fix.enlightenment
enlightenment.enlightenment: add dependency on bc
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/enlightenment/enlightenment.nix | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index b2a9d398709..a5724385e41 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -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" ]; |