diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2019-08-29 10:28:41 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-29 10:28:41 -0300 |
| commit | 097ae482d42815d6698b9799218a7ecc3e998c64 (patch) | |
| tree | 72e6a7daa4f019938ce6ff88c2a4fdd77bcfea06 | |
| parent | 35f4e95fb0cff9e568c918995c91c476fc30cceb (diff) | |
| parent | 9e04b3173ea53b2445d65be53b4c93049a52e77a (diff) | |
| download | nixlib-097ae482d42815d6698b9799218a7ecc3e998c64.tar nixlib-097ae482d42815d6698b9799218a7ecc3e998c64.tar.gz nixlib-097ae482d42815d6698b9799218a7ecc3e998c64.tar.bz2 nixlib-097ae482d42815d6698b9799218a7ecc3e998c64.tar.lz nixlib-097ae482d42815d6698b9799218a7ecc3e998c64.tar.xz nixlib-097ae482d42815d6698b9799218a7ecc3e998c64.tar.zst nixlib-097ae482d42815d6698b9799218a7ecc3e998c64.zip | |
Merge pull request #67628 from romildo/upd.enlightenment
enlightenment.enlightenment: 0.22.4 -> 0.23.0
| -rw-r--r-- | pkgs/desktops/enlightenment/enlightenment.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 07aac3d611b7..b2a9d3987097 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,16 +1,19 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa, - xkeyboard_config, pcre + xkeyboard_config, pcre, + + bluetoothSupport ? true, bluez5, + pulseSupport ? !stdenv.isDarwin, libpulseaudio, }: stdenv.mkDerivation rec { - name = "enlightenment-${version}"; - version = "0.22.4"; + pname = "enlightenment"; + version = "0.23.0"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0ygy891rrw5c7lhk539nhif77j88phvz2h0fhx172iaridy9kx2r"; + url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1y7x594gvyvl5zbb1rnf3clj2pm6j97n8wl5mp9x6xjmhx0d1idq"; }; nativeBuildInputs = [ @@ -36,8 +39,11 @@ stdenv.mkDerivation rec { pcre mesa xkeyboard_config - ] ++ - stdenv.lib.optionals stdenv.isLinux [ libcap ]; + ] + ++ stdenv.lib.optional stdenv.isLinux libcap + ++ stdenv.lib.optional bluetoothSupport bluez5 + ++ stdenv.lib.optional pulseSupport libpulseaudio + ; patches = [ # Some programs installed by enlightenment (to set the cpu frequency, |