Merge commit '683c68232e91f76386db979c461d8fbe2a018782'

2 files changed, 64 insertions, 15 deletions

diff --git a/nixpkgs/pkgs/desktops/enlightenment/econnman.nix b/nixpkgs/pkgs/desktops/enlightenment/econnman.nix
index dfe294ef5c6a..1979b4518a70 100644
--- a/nixpkgs/pkgs/desktops/enlightenment/econnman.nix
+++ b/nixpkgs/pkgs/desktops/enlightenment/econnman.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "econnman";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
   };
 
-  nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ];
+  nativeBuildInputs = [ makeWrapper pkgconfig python3Packages.wrapPython ];
 
-  buildInputs = [ efl python2Packages.python dbus ];
+  buildInputs = [ efl python3Packages.python dbus ];
 
-  pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ];
+  pythonPath = [ python3Packages.pythonefl python3Packages.dbus-python ];
 
   postInstall = ''
     wrapPythonPrograms
diff --git a/nixpkgs/pkgs/desktops/enlightenment/efl.nix b/nixpkgs/pkgs/desktops/enlightenment/efl.nix
index 7bf280cb99b5..bd6c0529925a 100644
--- a/nixpkgs/pkgs/desktops/enlightenment/efl.nix
+++ b/nixpkgs/pkgs/desktops/enlightenment/efl.nix
@@ -1,20 +1,65 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, SDL, SDL2, alsaLib,
-  avahi, bullet, check, curl, dbus, doxygen, expat, fontconfig,
-  freetype, fribidi, ghostscript, giflib, glib, gst_all_1, gtk3,
-  harfbuzz, ibus, jbig2dec, libGL, libdrm, libinput, libjpeg, libpng,
-  libpulseaudio, libraw, librsvg, libsndfile, libspectre, libtiff,
-  libwebp, libxkbcommon, luajit, lz4, mesa, openjpeg, openssl,
-  poppler, python27Packages, systemd, udev, utillinux, writeText,
-  xorg, zlib
+{ stdenv
+, fetchurl
+, meson
+, ninja
+, pkgconfig
+, SDL
+, SDL2
+, alsaLib
+, avahi
+, bullet
+, check
+, curl
+, dbus
+, doxygen
+, expat
+, fontconfig
+, freetype
+, fribidi
+, ghostscript
+, giflib
+, glib
+, gst_all_1
+, gtk3
+, harfbuzz
+, hicolor-icon-theme
+, ibus
+, jbig2dec
+, libGL
+, libdrm
+, libinput
+, libjpeg
+, libpng
+, libpulseaudio
+, libraw
+, librsvg
+, libsndfile
+, libspectre
+, libtiff
+, libwebp
+, libxkbcommon
+, luajit
+, lz4
+, mesa
+, openjpeg
+, openssl
+, poppler
+, python3Packages
+, systemd
+, udev
+, utillinux
+, writeText
+, xorg
+, zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "efl";
-  version = "1.23.3";
+  version = "1.24.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk";
+    sha256 = "1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk";
   };
 
   nativeBuildInputs = [
@@ -51,6 +96,7 @@ stdenv.mkDerivation rec {
     xorg.libXcursor
     xorg.xorgproto
     zlib
+    # still missing parent icon themes: Mint-X, RAVE-X, Faenza
   ];
 
   propagatedBuildInputs = [
@@ -77,7 +123,7 @@ stdenv.mkDerivation rec {
     luajit
     openjpeg
     poppler
-    python27Packages.dbus-python
+    python3Packages.dbus-python
     utillinux
     xorg.libXScrnSaver
     xorg.libXcomposite
@@ -95,11 +141,14 @@ stdenv.mkDerivation rec {
     xorg.xcbutilkeysyms
   ];
 
+  dontDropIconThemeCache = true;
+
   mesonFlags = [
     "--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 fb=true"
     "-D opengl=full"