diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 09:50:38 +0200 |
| commit | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (patch) | |
| tree | 982675c7719f2060a550e80747dfa49c1a9d6b06 /pkgs/desktops/enlightenment | |
| parent | 98640fd48212f8e6552517f667bba1901f5936d4 (diff) | |
| parent | 81760f32353fa7f309a49fda17d90f43ac1e9a42 (diff) | |
| download | nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.gz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.bz2 nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.lz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.xz nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.tar.zst nixpkgs-fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/enlightenment')
| -rw-r--r-- | pkgs/desktops/enlightenment/efl.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/enlightenment/enlightenment.nix | 18 | ||||
| -rw-r--r-- | pkgs/desktops/enlightenment/rage.nix | 6 |
3 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index f1b55607e3a..1876cce6c8a 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.22.2"; + version = "1.22.3"; src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/efl/${pname}-${version}.tar.xz"; - sha256 = "1l0wdgzxqm2y919277b1p9d37xzg808zwxxaw0nn44arh8gqk68n"; + url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1j1i8cwq4ym9z34ikv35mdmv5q7q69hdp494mc6l03g9n6cl2yky"; }; nativeBuildInputs = [ pkgconfig gtk3 ]; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index a15655ce2c9..b2a9d398709 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 { pname = "enlightenment"; - version = "0.22.4"; + version = "0.23.0"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/enlightenment/${pname}-${version}.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, diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 8362655f90e..8d99ce6e8e0 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rage"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/rage/${pname}-${version}.tar.xz"; - sha256 = "0gfzdd4jg78bkmj61yg49w7bzspl5m1nh6agqgs8k7qrq9q26xqy"; + url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; + sha256 = "04fdk23bbgvni212zrfy4ndg7vmshbsjgicrhckdvhay87pk9i75"; }; nativeBuildInputs = [ |