From ea78c87cc8ac302e7d93276a00cc58251559366a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:19:33 -0300 Subject: [PATCH 1/8] enlightenment.efl: 1.24.0 -> 1.24.1 --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index bd6c0529925..bd553018cd8 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -55,11 +55,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 = [ From 44aa59741d8d2059cdf029c35fcdb0297d537540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:24:26 -0300 Subject: [PATCH 2/8] enlightenment.efl: remove SDL dependence in favor of SDL2 --- pkgs/desktops/enlightenment/efl.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index bd553018cd8..ab3c4bdd768 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -3,7 +3,6 @@ , meson , ninja , pkgconfig -, SDL , SDL2 , alsaLib , avahi @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - SDL avahi fontconfig freetype From e3af180aa5e3a9c02ced11336661083aaba81f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:30:13 -0300 Subject: [PATCH 3/8] enlightenment.efl: no python script depends on dbus-python --- pkgs/desktops/enlightenment/efl.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index ab3c4bdd768..60e4d93c943 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -121,7 +121,6 @@ stdenv.mkDerivation rec { luajit openjpeg poppler - python3Packages.dbus-python utillinux xorg.libXScrnSaver xorg.libXcomposite From a1ad2590f8340811ec347ccdc096046345e21931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:38:12 -0300 Subject: [PATCH 4/8] enlightenment.efl: evas loaders disabler defaults to json No need to mention it explicitly. --- pkgs/desktops/enlightenment/efl.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 60e4d93c943..be025ead407 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -144,9 +144,8 @@ 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 sdl=true" From 4e02f045b63bc44e0d0c625f8c923629f0178326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 13:44:41 -0300 Subject: [PATCH 5/8] enlightenment.efl: use the default tpe of OpenGL support: es-egl According to the Debian package full OpenGL is no longer supported on Linux. --- pkgs/desktops/enlightenment/efl.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index be025ead407..cc66ee7e24a 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -147,7 +147,6 @@ stdenv.mkDerivation rec { "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs "-D embedded-lz4=false" "-D fb=true" - "-D opengl=full" "-D sdl=true" ]; From 4a03e20b03f48d4554ff3aa465ccd4acd2eb5c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 14:24:04 -0300 Subject: [PATCH 6/8] enlightenment.efl: does not depend on libXp, libxkbfile and xcbutilkeysyms --- pkgs/desktops/enlightenment/efl.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index cc66ee7e24a..c147766c2a0 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -129,13 +129,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; From 9f3f8088ac6d343dbbc216cf03c6720ba937d581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 15:25:28 -0300 Subject: [PATCH 7/8] enlightenment.efl: avahi is not enabled by default --- pkgs/desktops/enlightenment/efl.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index c147766c2a0..07443cfd781 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -5,7 +5,6 @@ , pkgconfig , SDL2 , alsaLib -, avahi , bullet , check , curl @@ -70,7 +69,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - avahi fontconfig freetype giflib From 7bb9ae7be7e4c8e6f43e0af3bb8e5ff18f4be6da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 13 May 2020 15:29:34 -0300 Subject: [PATCH 8/8] enlightenment.efl: enable connman network backend Default is none. --- pkgs/desktops/enlightenment/efl.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 07443cfd781..78f8f3966ed 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -142,6 +142,7 @@ stdenv.mkDerivation rec { "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs "-D embedded-lz4=false" "-D fb=true" + "-D network-backend=connman" "-D sdl=true" ];