diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-05-18 14:34:25 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-05-18 16:21:12 +0000 |
| commit | 93e90ca356baed5941e1cccf8c0d8e3e2c460e29 (patch) | |
| tree | f6c26f06a2f830a3f1bab00fdc029b76be8805c6 /nixpkgs/pkgs/desktops/enlightenment | |
| parent | d2753504ef2bd591ade35851dad31d3aac117e19 (diff) | |
| parent | b47873026c7e356a340d0e1de7789d4e8428ac66 (diff) | |
| download | nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.gz nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.bz2 nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.lz nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.xz nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.tar.zst nixlib-93e90ca356baed5941e1cccf8c0d8e3e2c460e29.zip | |
Merge commit 'b47873026c7e356a340d0e1de7789d4e8428ac66'
Diffstat (limited to 'nixpkgs/pkgs/desktops/enlightenment')
| -rw-r--r-- | nixpkgs/pkgs/desktops/enlightenment/efl.nix | 17 | ||||
| -rw-r--r-- | nixpkgs/pkgs/desktops/enlightenment/terminology.nix | 4 |
2 files changed, 6 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/desktops/enlightenment/efl.nix b/nixpkgs/pkgs/desktops/enlightenment/efl.nix index bd6c0529925a..78f8f3966ed5 100644 --- a/nixpkgs/pkgs/desktops/enlightenment/efl.nix +++ b/nixpkgs/pkgs/desktops/enlightenment/efl.nix @@ -3,10 +3,8 @@ , meson , ninja , pkgconfig -, SDL , SDL2 , alsaLib -, avahi , bullet , check , curl @@ -55,11 +53,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk"; + sha256 = "1xsbz5kl74cgzyzwmjy3p50m0iigvi53lklkp92v49k4j99zpak7"; }; nativeBuildInputs = [ @@ -71,8 +69,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL - avahi fontconfig freetype giflib @@ -123,7 +119,6 @@ stdenv.mkDerivation rec { luajit openjpeg poppler - python3Packages.dbus-python utillinux xorg.libXScrnSaver xorg.libXcomposite @@ -132,13 +127,10 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXi xorg.libXinerama - xorg.libXp xorg.libXrandr xorg.libXrender xorg.libXtst xorg.libxcb - xorg.libxkbfile - xorg.xcbutilkeysyms ]; dontDropIconThemeCache = true; @@ -147,11 +139,10 @@ stdenv.mkDerivation rec { "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working "-D drm=true" - "-D embedded-lz4=false" "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs - "-D evas-loaders-disabler=json" + "-D embedded-lz4=false" "-D fb=true" - "-D opengl=full" + "-D network-backend=connman" "-D sdl=true" ]; diff --git a/nixpkgs/pkgs/desktops/enlightenment/terminology.nix b/nixpkgs/pkgs/desktops/enlightenment/terminology.nix index 205d133e1d29..3eff9292cb6c 100644 --- a/nixpkgs/pkgs/desktops/enlightenment/terminology.nix +++ b/nixpkgs/pkgs/desktops/enlightenment/terminology.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "terminology"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0xxx4xyhis6fy3frgb34ip0aj0kc4zashf60gzbxmq5gadbb0p5r"; + sha256 = "11qan2k6w94cglysh95yxkbv6hw9x15ri927hkiy3k0hbmpbrxc8"; }; nativeBuildInputs = [ |