From e358d9498c493a3e53769e0514afed8836ae0b3e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 12 Mar 2016 02:43:40 +0300
Subject: e19: rename to enlightenment, drop old one

---
 pkgs/desktops/e19/default.nix                 | 16 --------
 pkgs/desktops/e19/econnman.nix                | 23 -----------
 pkgs/desktops/e19/efl-elua.patch              | 14 -------
 pkgs/desktops/e19/efl.nix                     | 56 ---------------------------
 pkgs/desktops/e19/elementary.nix              | 20 ----------
 pkgs/desktops/e19/elementary.patch            | 18 ---------
 pkgs/desktops/e19/emotion.nix                 | 18 ---------
 pkgs/desktops/e19/enlightenment.nix           | 47 ----------------------
 pkgs/desktops/e19/evas.nix                    | 17 --------
 pkgs/desktops/e19/rage.nix                    | 31 ---------------
 pkgs/desktops/e19/terminology.nix             | 17 --------
 pkgs/desktops/enlightenment/default.nix       | 41 +++++++-------------
 pkgs/desktops/enlightenment/econnman.nix      | 23 +++++++++++
 pkgs/desktops/enlightenment/efl-elua.patch    | 14 +++++++
 pkgs/desktops/enlightenment/efl.nix           | 56 +++++++++++++++++++++++++++
 pkgs/desktops/enlightenment/elementary.nix    | 20 ++++++++++
 pkgs/desktops/enlightenment/elementary.patch  | 18 +++++++++
 pkgs/desktops/enlightenment/emotion.nix       | 18 +++++++++
 pkgs/desktops/enlightenment/enlightenment.nix | 47 ++++++++++++++++++++++
 pkgs/desktops/enlightenment/evas.nix          | 17 ++++++++
 pkgs/desktops/enlightenment/rage.nix          | 31 +++++++++++++++
 pkgs/desktops/enlightenment/terminology.nix   | 17 ++++++++
 22 files changed, 275 insertions(+), 304 deletions(-)
 delete mode 100644 pkgs/desktops/e19/default.nix
 delete mode 100644 pkgs/desktops/e19/econnman.nix
 delete mode 100644 pkgs/desktops/e19/efl-elua.patch
 delete mode 100644 pkgs/desktops/e19/efl.nix
 delete mode 100644 pkgs/desktops/e19/elementary.nix
 delete mode 100644 pkgs/desktops/e19/elementary.patch
 delete mode 100644 pkgs/desktops/e19/emotion.nix
 delete mode 100644 pkgs/desktops/e19/enlightenment.nix
 delete mode 100644 pkgs/desktops/e19/evas.nix
 delete mode 100644 pkgs/desktops/e19/rage.nix
 delete mode 100644 pkgs/desktops/e19/terminology.nix
 create mode 100644 pkgs/desktops/enlightenment/econnman.nix
 create mode 100644 pkgs/desktops/enlightenment/efl-elua.patch
 create mode 100644 pkgs/desktops/enlightenment/efl.nix
 create mode 100644 pkgs/desktops/enlightenment/elementary.nix
 create mode 100644 pkgs/desktops/enlightenment/elementary.patch
 create mode 100644 pkgs/desktops/enlightenment/emotion.nix
 create mode 100644 pkgs/desktops/enlightenment/enlightenment.nix
 create mode 100644 pkgs/desktops/enlightenment/evas.nix
 create mode 100644 pkgs/desktops/enlightenment/rage.nix
 create mode 100644 pkgs/desktops/enlightenment/terminology.nix

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix
deleted file mode 100644
index b285498be9dc..000000000000
--- a/pkgs/desktops/e19/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ callPackage, pkgs }:
-rec {
-  #### CORE EFL
-  efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
-  evas = callPackage ./evas.nix { };
-  emotion = callPackage ./emotion.nix { };
-  elementary = callPackage ./elementary.nix { };
-
-  #### WINDOW MANAGER
-  enlightenment = callPackage ./enlightenment.nix { };
-
-  #### APPLICATIONS
-  econnman = callPackage ./econnman.nix { };
-  terminology = callPackage ./terminology.nix { };
-  rage = callPackage ./rage.nix { };
-}
diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix
deleted file mode 100644
index 35b58aec638d..000000000000
--- a/pkgs/desktops/e19/econnman.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, e19, python27, python27Packages, dbus, makeWrapper }:
-stdenv.mkDerivation rec {
-  name = "econnman-${version}";
-  version = "1.1";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
-    sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
-  };
-
-  buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ];
-  propagatedBuildInputs = [ python27Packages.pythonefl_1_16 python27Packages.dbus e19.elementary ];
-  postInstall = ''
-    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_16}/lib/python2.7/site-packages
-  '';
-
-  meta = {
-    description = "A user interface for the connman network connection manager";
-    homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl3;
-  };
-}
diff --git a/pkgs/desktops/e19/efl-elua.patch b/pkgs/desktops/e19/efl-elua.patch
deleted file mode 100644
index 96c42b3ff3ca..000000000000
--- a/pkgs/desktops/e19/efl-elua.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/scripts/elua/core/util.lua.old	2015-05-17 11:59:57.307743243 +0200
-+++ ./src/scripts/elua/core/util.lua	2015-05-17 12:39:11.906797377 +0200
-@@ -159,7 +159,10 @@
-         local ev = os.getenv("ELUA_" .. libname:upper() .. "_LIBRARY_PATH")
-         local succ, v = load_lib(libname, ev)
-         if not succ then
--            error(v, 2)
-+            succ, v = load_lib(libname, "$out/lib")
-+            if not succ then
-+                error(v, 2)
-+            end
-         end
-         lib = v
-         loaded_libs[libname] = lib
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
deleted file mode 100644
index dd9c837ed8b2..000000000000
--- a/pkgs/desktops/e19/efl.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput }:
-
-
-stdenv.mkDerivation rec {
-  name = "efl-${version}";
-  version = "1.16.1";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg";
-  };
-
-  buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
-    giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
-    gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
-    xorg.libX11 udev utillinux ];
-
-  propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite
-    xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
-    bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
-    xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
-    harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib libwebp curl libdrm
-    libinput ];
-
-  # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
-  configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full"
-    "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd"
-    "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb"
-    "--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
-    "ac_ct_CXX=foo" ];
-
-  NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ];
-
-  patches = [ ./efl-elua.patch ];
-
-  preConfigure = ''
-    export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
-    export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
-  '';
-
-  postInstall = ''
-    substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out"
-    modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done)
-    substituteInPlace "$out/lib/pkgconfig/efl.pc" --replace 'Cflags: -I''${includedir}/efl-1' \
-      'Cflags: -I''${includedir}/eina-1/eina'"$modules"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Enlightenment Core libraries";
-    homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl3;
-  };
-}
diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix
deleted file mode 100644
index 1793a7e87c47..000000000000
--- a/pkgs/desktops/e19/elementary.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }:
-stdenv.mkDerivation rec {
-  name = "elementary-${version}";
-  version = "1.16.1";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz";
-    sha256 = "0q58imh7s35q6cq5hsa6gqj84rkckh8s61iass8zyvcw19j66f3y";
-  };
-  buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
-  NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];
-  patches = [ ./elementary.patch ];
-  enableParallelBuilding = true;
-  meta = {
-    description = "Widget set/toolkit";
-    homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl2;
-  };
-}
diff --git a/pkgs/desktops/e19/elementary.patch b/pkgs/desktops/e19/elementary.patch
deleted file mode 100644
index 32080c81cb38..000000000000
--- a/pkgs/desktops/e19/elementary.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/elementary.pc.in	2015-05-16 21:08:14.321148417 +0200
-+++ b/elementary.pc.in	2015-05-16 21:08:30.643412725 +0200
-@@ -14,4 +14,4 @@
- Requires.private: @requirement_elm_pc@
- Version: @VERSION@
- Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@
--Cflags: -I${includedir}/elementary-@VMAJ@
-+Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_PC_CFLAGS@
---- a/Makefile.am	2015-05-16 21:08:14.322148433 +0200
-+++ b/Makefile.am	2015-05-16 21:08:30.643412725 +0200
-@@ -84,6 +84,7 @@
- -e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \
- -e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \
- -e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \
-+-e 's,@ELEMENTARY_PC_CFLAGS\@,$(ELEMENTARY_PC_CFLAGS),g' \
- < $< > $@ || rm $@
- 
- pc_verbose = $(pc_verbose_@AM_V@)
diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix
deleted file mode 100644
index c38119719a0b..000000000000
--- a/pkgs/desktops/e19/emotion.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, e19, vlc }:
-stdenv.mkDerivation rec {
-  name = "emotion_generic_players-${version}";
-  version = "1.16.0";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz";
-    sha256 = "163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym";
-  };
-  buildInputs = [ pkgconfig e19.efl vlc ];
-  NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ];
-  meta = {
-    description = "Extra video decoders";
-    homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.bsd2;
-  };
-}
diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix
deleted file mode 100644
index 5112058f8c6c..000000000000
--- a/pkgs/desktops/e19/enlightenment.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2, libuuid
-, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }:
-
-stdenv.mkDerivation rec {
-  name = "enlightenment-${version}";
-  version = "0.20.3";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "19z3bwdzwpzwi330l5g5mj7xy6wy8xrc39zivjhm0d1ql3fh649j";
-  };
-  buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb
-    xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libuuid
-    libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
-  NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" "-I${libuuid}/include/uuid" ];
-  preConfigure = ''
-    export USER_SESSION_DIR=$prefix/lib/systemd/user
-
-    substituteInPlace src/modules/xkbswitch/e_mod_parse.c \
-      --replace "/usr/share/X11/xkb/rules/xorg.lst" "${xkeyboard_config}/share/X11/xkb/rules/base.lst"
-
-    substituteInPlace "src/bin/e_import_config_dialog.c" \
-      --replace "e_prefix_bin_get()" "\"${e19.efl}/bin\""
-  '';
-
-  enableParallelBuilding = true;
-
-  # this is a hack and without this cpufreq module is not working:
-  #   when set_freqset_setuid is true and "e19_freqset" is set in setuidPrograms (this is taken care of in e19 NixOS module),
-  #   then this postInstall does the folowing:
-  #   1. moves the "freqset" binary to "e19_freqset",
-  #   2. linkes "e19_freqset" to enlightenment/bin so that,
-  #   3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e19_freqset,
-  #   4. and finaly, linkes /var/setuid-wrappers/e19_freqset to original destination where enlightenment wants it
-  postInstall = if set_freqset_setuid then ''
-    export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`;
-    mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e19_freqset
-    ln -sv $CPUFREQ_DIRPATH/e19_freqset $out/bin/e19_freqset
-    ln -sv /var/setuid-wrappers/e19_freqset $CPUFREQ_DIRPATH/freqset
-  '' else "";
-  meta = {
-    description = "The Compositing Window Manager and Desktop Shell";
-    homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.bsd2;
-  };
-}
diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix
deleted file mode 100644
index b777dc893d70..000000000000
--- a/pkgs/desktops/e19/evas.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
-stdenv.mkDerivation rec {
-  name = "evas_generic_loaders-${version}";
-  version = "1.16.0";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz";
-    sha256 = "1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm";
-  };
-  buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
-  meta = {
-    description = "Extra image decoders";
-    homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/e19/rage.nix
deleted file mode 100644
index 19c99ac17eb9..000000000000
--- a/pkgs/desktops/e19/rage.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, e19, automake, autoconf, libtool, pkgconfig, gst_all_1
-, makeWrapper, lib }:
-stdenv.mkDerivation rec {
-  name = "rage-${version}";
-  version = "0.1.4";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz";
-    sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg";
-  };
-  buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig
-    makeWrapper ];
-  GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [
-    gst_all_1.gst-plugins-base
-    gst_all_1.gst-plugins-good
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-libav ];
-  configurePhase = ''
-    ./autogen.sh --prefix=$out
-  '';
-  postInstall = ''
-    wrapProgram $out/bin/rage \
-      --prefix GST_PLUGIN_PATH : "$GST_PLUGIN_PATH"
-  '';
-  meta = {
-    description = "Video + Audio player along the lines of mplayer";
-    homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.bsd2;
-  };
-}
diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix
deleted file mode 100644
index 195a1f436644..000000000000
--- a/pkgs/desktops/e19/terminology.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, e19 }:
-stdenv.mkDerivation rec {
-  name = "terminology-${version}";
-  version = "0.9.1";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc";
-  };
-  buildInputs = [ pkgconfig e19.efl e19.elementary ];
-  meta = {
-    description = "The best terminal emulator written with the EFL";
-    homepage = http://enlightenment.org/;
-    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.bsd2;
-  };
-}
diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index 5aa3d781e4b3..b285498be9dc 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -1,29 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, xlibsWrapper, xorg, dbus, imlib2, freetype }:
+{ callPackage, pkgs }:
+rec {
+  #### CORE EFL
+  efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
+  evas = callPackage ./evas.nix { };
+  emotion = callPackage ./emotion.nix { };
+  elementary = callPackage ./elementary.nix { };
 
-let version = "0.16.8.15"; in
-  stdenv.mkDerivation {
-    name = "enlightenment-${version}";
+  #### WINDOW MANAGER
+  enlightenment = callPackage ./enlightenment.nix { };
 
-    src = fetchurl {
-      url = "mirror://sourceforge/enlightenment/e16-${version}.tar.gz";
-      sha256 = "0f8hg79mrk6b3fsvynvsrnqh1zgmvnnza0lf7qn4pq2mqyigbhgk";
-    };
-
-    buildInputs = [pkgconfig imlib2 freetype 
-      xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXft ];
-
-    meta = {
-      description = "Desktop shell built on the Enlightenment Foundation Libraries";
-
-      longDescription = ''
-        Enlightenment is a window manager.  Enlightenment is a desktop
-        shell.  Enlightenment is the building blocks to create
-        beautiful applications.  Enlightenment, or simply e, is a
-        group of people trying to make a new generation of software.
-      '';
-
-      homepage = http://enlightenment.org/;
-
-      license = "BSD-style";
-    };
-  }
+  #### APPLICATIONS
+  econnman = callPackage ./econnman.nix { };
+  terminology = callPackage ./terminology.nix { };
+  rage = callPackage ./rage.nix { };
+}
diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix
new file mode 100644
index 000000000000..f1ffe7cd6044
--- /dev/null
+++ b/pkgs/desktops/enlightenment/econnman.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, efl, elementary, python27, python27Packages, dbus, makeWrapper }:
+stdenv.mkDerivation rec {
+  name = "econnman-${version}";
+  version = "1.1";
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz";
+    sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
+  };
+
+  buildInputs = [ makeWrapper pkgconfig efl python27 dbus ];
+  propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus elementary ];
+  postInstall = ''
+    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages
+  '';
+
+  meta = {
+    description = "A user interface for the connman network connection manager";
+    homepage = http://enlightenment.org/;
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.lgpl3;
+  };
+}
diff --git a/pkgs/desktops/enlightenment/efl-elua.patch b/pkgs/desktops/enlightenment/efl-elua.patch
new file mode 100644
index 000000000000..96c42b3ff3ca
--- /dev/null
+++ b/pkgs/desktops/enlightenment/efl-elua.patch
@@ -0,0 +1,14 @@
+--- ./src/scripts/elua/core/util.lua.old	2015-05-17 11:59:57.307743243 +0200
++++ ./src/scripts/elua/core/util.lua	2015-05-17 12:39:11.906797377 +0200
+@@ -159,7 +159,10 @@
+         local ev = os.getenv("ELUA_" .. libname:upper() .. "_LIBRARY_PATH")
+         local succ, v = load_lib(libname, ev)
+         if not succ then
+-            error(v, 2)
++            succ, v = load_lib(libname, "$out/lib")
++            if not succ then
++                error(v, 2)
++            end
+         end
+         lib = v
+         loaded_libs[libname] = lib
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
new file mode 100644
index 000000000000..dd9c837ed8b2
--- /dev/null
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput }:
+
+
+stdenv.mkDerivation rec {
+  name = "efl-${version}";
+  version = "1.16.1";
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
+    sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg";
+  };
+
+  buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
+    giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
+    gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
+    xorg.libX11 udev utillinux ];
+
+  propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite
+    xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
+    bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr
+    xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit
+    harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib libwebp curl libdrm
+    libinput ];
+
+  # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++
+  configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full"
+    "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd"
+    "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb"
+    "--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
+    "ac_ct_CXX=foo" ];
+
+  NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ];
+
+  patches = [ ./efl-elua.patch ];
+
+  preConfigure = ''
+    export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
+    export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
+  '';
+
+  postInstall = ''
+    substituteInPlace "$out/share/elua/core/util.lua" --replace '$out' "$out"
+    modules=$(for i in "$out/include/"*/; do printf ' -I''${includedir}/'`basename $i`; done)
+    substituteInPlace "$out/lib/pkgconfig/efl.pc" --replace 'Cflags: -I''${includedir}/efl-1' \
+      'Cflags: -I''${includedir}/eina-1/eina'"$modules"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Enlightenment Core libraries";
+    homepage = http://enlightenment.org/;
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.lgpl3;
+  };
+}
diff --git a/pkgs/desktops/enlightenment/elementary.nix b/pkgs/desktops/enlightenment/elementary.nix
new file mode 100644
index 000000000000..a1a4b955d9ea
--- /dev/null
+++ b/pkgs/desktops/enlightenment/elementary.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, efl, libcap, automake114x, autoconf, libdrm, gdbm }:
+stdenv.mkDerivation rec {
+  name = "elementary-${version}";
+  version = "1.16.1";
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz";
+    sha256 = "0q58imh7s35q6cq5hsa6gqj84rkckh8s61iass8zyvcw19j66f3y";
+  };
+  buildInputs = [ pkgconfig efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];
+  patches = [ ./elementary.patch ];
+  enableParallelBuilding = true;
+  meta = {
+    description = "Widget set/toolkit";
+    homepage = http://enlightenment.org/;
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.lgpl2;
+  };
+}
diff --git a/pkgs/desktops/enlightenment/elementary.patch b/pkgs/desktops/enlightenment/elementary.patch
new file mode 100644
index 000000000000..32080c81cb38
--- /dev/null
+++ b/pkgs/desktops/enlightenment/elementary.patch
@@ -0,0 +1,18 @@
+--- a/elementary.pc.in	2015-05-16 21:08:14.321148417 +0200
++++ b/elementary.pc.in	2015-05-16 21:08:30.643412725 +0200
+@@ -14,4 +14,4 @@
+ Requires.private: @requirement_elm_pc@
+ Version: @VERSION@
+ Libs: -L${libdir} -lelementary @ELEMENTARY_PC_LIBS@
+-Cflags: -I${includedir}/elementary-@VMAJ@
++Cflags: -I${includedir}/elementary-@VMAJ@ @ELEMENTARY_PC_CFLAGS@
+--- a/Makefile.am	2015-05-16 21:08:14.322148433 +0200
++++ b/Makefile.am	2015-05-16 21:08:30.643412725 +0200
+@@ -84,6 +84,7 @@
+ -e 's,@requirement_elm_pc\@,$(requirement_elm_pc),g' \
+ -e 's,@ELEMENTARY_LIBS\@,$(ELEMENTARY_LIBS),g' \
+ -e 's,@ELEMENTARY_PC_LIBS\@,$(ELEMENTARY_PC_LIBS),g' \
++-e 's,@ELEMENTARY_PC_CFLAGS\@,$(ELEMENTARY_PC_CFLAGS),g' \
+ < $< > $@ || rm $@
+ 
+ pc_verbose = $(pc_verbose_@AM_V@)
diff --git a/pkgs/desktops/enlightenment/emotion.nix b/pkgs/desktops/enlightenment/emotion.nix
new file mode 100644
index 000000000000..282ef81ab4e2
--- /dev/null
+++ b/pkgs/desktops/enlightenment/emotion.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, efl, vlc }:
+stdenv.mkDerivation rec {
+  name = "emotion_generic_players-${version}";
+  version = "1.16.0";
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz";
+    sha256 = "163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym";
+  };
+  buildInputs = [ pkgconfig efl vlc ];
+  NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" ];
+  meta = {
+    description = "Extra video decoders";
+    homepage = http://enlightenment.org/;
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
new file mode 100644
index 000000000000..ee9b3fbc526c
--- /dev/null
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, pkgconfig, efl, elementary, xorg, libffi, pam, alsaLib, luajit, bzip2, libuuid
+, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }:
+
+stdenv.mkDerivation rec {
+  name = "enlightenment-${version}";
+  version = "0.20.3";
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
+    sha256 = "19z3bwdzwpzwi330l5g5mj7xy6wy8xrc39zivjhm0d1ql3fh649j";
+  };
+  buildInputs = [ pkgconfig efl elementary xorg.libXdmcp xorg.libxcb
+    xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libuuid
+    libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" "-I${efl}/include/emile-1" "-I${libuuid}/include/uuid" ];
+  preConfigure = ''
+    export USER_SESSION_DIR=$prefix/lib/systemd/user
+
+    substituteInPlace src/modules/xkbswitch/e_mod_parse.c \
+      --replace "/usr/share/X11/xkb/rules/xorg.lst" "${xkeyboard_config}/share/X11/xkb/rules/base.lst"
+
+    substituteInPlace "src/bin/e_import_config_dialog.c" \
+      --replace "e_prefix_bin_get()" "\"${efl}/bin\""
+  '';
+
+  enableParallelBuilding = true;
+
+  # this is a hack and without this cpufreq module is not working:
+  #   when set_freqset_setuid is true and "e_freqset" is set in setuidPrograms (this is taken care of in e19 NixOS module),
+  #   then this postInstall does the folowing:
+  #   1. moves the "freqset" binary to "e_freqset",
+  #   2. linkes "e_freqset" to enlightenment/bin so that,
+  #   3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e_freqset,
+  #   4. and finaly, linkes /var/setuid-wrappers/e_freqset to original destination where enlightenment wants it
+  postInstall = if set_freqset_setuid then ''
+    export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`;
+    mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e_freqset
+    ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset
+    ln -sv /var/setuid-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset
+  '' else "";
+  meta = {
+    description = "The Compositing Window Manager and Desktop Shell";
+    homepage = http://enlightenment.org/;
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/desktops/enlightenment/evas.nix b/pkgs/desktops/enlightenment/evas.nix
new file mode 100644
index 000000000000..6cc6af9678b2
--- /dev/null
+++ b/pkgs/desktops/enlightenment/evas.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, efl, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
+stdenv.mkDerivation rec {
+  name = "evas_generic_loaders-${version}";
+  version = "1.16.0";
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz";
+    sha256 = "1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm";
+  };
+  buildInputs = [ pkgconfig efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
+  meta = {
+    description = "Extra image decoders";
+    homepage = http://enlightenment.org/;
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix
new file mode 100644
index 000000000000..8c3391cf2714
--- /dev/null
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, elementary, efl, automake, autoconf, libtool, pkgconfig, gst_all_1
+, makeWrapper, lib }:
+stdenv.mkDerivation rec {
+  name = "rage-${version}";
+  version = "0.1.4";
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz";
+    sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg";
+  };
+  buildInputs = [ elementary efl automake autoconf libtool pkgconfig
+    makeWrapper ];
+  GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-libav ];
+  configurePhase = ''
+    ./autogen.sh --prefix=$out
+  '';
+  postInstall = ''
+    wrapProgram $out/bin/rage \
+      --prefix GST_PLUGIN_PATH : "$GST_PLUGIN_PATH"
+  '';
+  meta = {
+    description = "Video + Audio player along the lines of mplayer";
+    homepage = http://enlightenment.org/;
+    maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
new file mode 100644
index 000000000000..a302b7d5f612
--- /dev/null
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, efl, elementary }:
+stdenv.mkDerivation rec {
+  name = "terminology-${version}";
+  version = "0.9.1";
+  src = fetchurl {
+    url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
+    sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc";
+  };
+  buildInputs = [ pkgconfig efl elementary ];
+  meta = {
+    description = "The best terminal emulator written with the EFL";
+    homepage = http://enlightenment.org/;
+    maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
-- 
cgit 1.4.1


From 3f6ad460e7586133bef4bf609ad96b0257271e21 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 12 Mar 2016 02:52:32 +0300
Subject: enlightenment.efl: 1.16.1 -> 1.17.0

---
 nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 +-
 pkgs/desktops/enlightenment/efl.nix                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 6c77a7256793..994960b1d37f 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -76,7 +76,7 @@ in
     services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
-    #services.dbus.packages = [ pkgs.efl ]; # dbus-1 folder is not in /etc but in /share, so needs fixing first
+    services.dbus.packages = [ e.efl ];
 
     systemd.user.services.efreet =
       { enable = true;
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index dd9c837ed8b2..c2124f0b2928 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.16.1";
+  version = "1.17.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg";
+    sha256 = "1zisnz4x54mn9sm46kcr571faqnazkcglyf0lbz19l34syx40df1";
   };
 
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
-- 
cgit 1.4.1


From 7fb2291f55ecd5a657d6d2e9e208c05d3a794adc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 12 Mar 2016 02:53:02 +0300
Subject: enlightenment.enlightenment: 0.20.3 -> 0.20.6

---
 .../x11/desktop-managers/enlightenment.nix         |  6 ++----
 pkgs/desktops/enlightenment/enlightenment.nix      | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 994960b1d37f..c981b40f74a6 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -7,7 +7,6 @@ let
   e = pkgs.enlightenment;
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.enlightenment;
-  enlightenment = e.enlightenment.override { set_freqset_setuid = true; };
   GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [
     pkgs.gst_all_1.gst-plugins-base
     pkgs.gst_all_1.gst-plugins-good
@@ -30,7 +29,7 @@ in
   config = mkIf (xcfg.enable && cfg.enable) {
 
     environment.systemPackages = [
-      e.efl e.evas e.emotion e.elementary enlightenment
+      e.efl e.evas e.emotion e.elementary e.enlightenment
       e.terminology e.econnman
       pkgs.xorg.xauth # used by kdesu
       pkgs.gtk # To get GTK+'s themes.
@@ -59,8 +58,7 @@ in
         # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
         ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
 
-        ${enlightenment}/bin/enlightenment_start
-        waitPID=$!
+        exec ${e.enlightenment}/bin/enlightenment_start
       '';
     }];
 
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index ee9b3fbc526c..ea232a2c6070 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, efl, elementary, xorg, libffi, pam, alsaLib, luajit, bzip2, libuuid
-, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }:
+{ stdenv, fetchurl, pkgconfig, efl, elementary, xcbutilkeysyms, libXrandr, libXdmcp, libxcb,
+libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mesa_glu
+, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.20.3";
+  version = "0.20.6";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "19z3bwdzwpzwi330l5g5mj7xy6wy8xrc39zivjhm0d1ql3fh649j";
+    sha256 = "11ahll68nlci214ka05whp5l32hy9lznmcdfqx3hxsmq2p7bl7zj";
   };
-  buildInputs = [ pkgconfig efl elementary xorg.libXdmcp xorg.libxcb
-    xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libuuid
+  buildInputs = [ pkgconfig efl elementary libXdmcp libxcb
+    xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libuuid
     libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
   NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" "-I${efl}/include/emile-1" "-I${libuuid}/include/uuid" ];
   preConfigure = ''
@@ -24,19 +25,18 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # this is a hack and without this cpufreq module is not working:
-  #   when set_freqset_setuid is true and "e_freqset" is set in setuidPrograms (this is taken care of in e19 NixOS module),
-  #   then this postInstall does the folowing:
+  # this is a hack and without this cpufreq module is not working. does the following:
   #   1. moves the "freqset" binary to "e_freqset",
   #   2. linkes "e_freqset" to enlightenment/bin so that,
   #   3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e_freqset,
   #   4. and finaly, linkes /var/setuid-wrappers/e_freqset to original destination where enlightenment wants it
-  postInstall = if set_freqset_setuid then ''
+  postInstall = ''
     export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`;
     mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e_freqset
     ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset
     ln -sv /var/setuid-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset
-  '' else "";
+  '';
+
   meta = {
     description = "The Compositing Window Manager and Desktop Shell";
     homepage = http://enlightenment.org/;
-- 
cgit 1.4.1


From f09d15489e71d2e333c721207585c9d69fa6a409 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 12 Mar 2016 02:53:48 +0300
Subject: enlightenment.evas: 1.16.0 -> 1.17.0

---
 pkgs/desktops/enlightenment/evas.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/enlightenment/evas.nix b/pkgs/desktops/enlightenment/evas.nix
index 6cc6af9678b2..fe8897b8be7a 100644
--- a/pkgs/desktops/enlightenment/evas.nix
+++ b/pkgs/desktops/enlightenment/evas.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, efl, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
 stdenv.mkDerivation rec {
   name = "evas_generic_loaders-${version}";
-  version = "1.16.0";
+  version = "1.17.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz";
-    sha256 = "1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm";
+    sha256 = "0ynq1nx0bfgg19p4vki1fap36yyip53zaxpzncx2slr6jcx1kxf2";
   };
   buildInputs = [ pkgconfig efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
   meta = {
-- 
cgit 1.4.1


From 94a2187cc001ee50d6dfdda4e75095a7e9d6df57 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 12 Mar 2016 02:53:55 +0300
Subject: enlightenment.emotion: 1.16.0 -> 1.17.0

---
 pkgs/desktops/enlightenment/emotion.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/enlightenment/emotion.nix b/pkgs/desktops/enlightenment/emotion.nix
index 282ef81ab4e2..39b3b1620751 100644
--- a/pkgs/desktops/enlightenment/emotion.nix
+++ b/pkgs/desktops/enlightenment/emotion.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, efl, vlc }:
 stdenv.mkDerivation rec {
   name = "emotion_generic_players-${version}";
-  version = "1.16.0";
+  version = "1.17.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz";
-    sha256 = "163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym";
+    sha256 = "03kaql95mk0c5j50v3c5i5lmlr3gz7xlh8p8q87xz8zf9j5h1pp7";
   };
   buildInputs = [ pkgconfig efl vlc ];
   NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" ];
-- 
cgit 1.4.1


From 42285cb36d78e064fa951acc405cc9aef143ad81 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 12 Mar 2016 02:54:09 +0300
Subject: enlightenment.elementary: 1.16.1 -> 1.17.0

---
 pkgs/desktops/enlightenment/elementary.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/enlightenment/elementary.nix b/pkgs/desktops/enlightenment/elementary.nix
index a1a4b955d9ea..ffb0d70920eb 100644
--- a/pkgs/desktops/enlightenment/elementary.nix
+++ b/pkgs/desktops/enlightenment/elementary.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, efl, libcap, automake114x, autoconf, libdrm, gdbm }:
+{ stdenv, fetchurl, pkgconfig, efl, libcap, automake, autoconf, libdrm, gdbm }:
 stdenv.mkDerivation rec {
   name = "elementary-${version}";
-  version = "1.16.1";
+  version = "1.17.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz";
-    sha256 = "0q58imh7s35q6cq5hsa6gqj84rkckh8s61iass8zyvcw19j66f3y";
+    sha256 = "0avb0d6nk4d88l81c2j6py13vdfnvg080ycw2y3qvawyjf1mhska";
   };
-  buildInputs = [ pkgconfig efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  buildInputs = [ pkgconfig efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
   NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];
   patches = [ ./elementary.patch ];
   enableParallelBuilding = true;
-- 
cgit 1.4.1


From b4390eaac3ab176a650864a3252b3921c4da0c4e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 12 Mar 2016 02:54:29 +0300
Subject: enlightenment.econnman: cleanup, use python wrapper

---
 pkgs/desktops/enlightenment/econnman.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix
index f1ffe7cd6044..0dabd7f1347f 100644
--- a/pkgs/desktops/enlightenment/econnman.nix
+++ b/pkgs/desktops/enlightenment/econnman.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, efl, elementary, python27, python27Packages, dbus, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, elementary, python2Packages, dbus, makeWrapper }:
 stdenv.mkDerivation rec {
   name = "econnman-${version}";
   version = "1.1";
@@ -7,10 +7,10 @@ stdenv.mkDerivation rec {
     sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0";
   };
 
-  buildInputs = [ makeWrapper pkgconfig efl python27 dbus ];
-  propagatedBuildInputs = [ python27Packages.pythonefl python27Packages.dbus elementary ];
+  buildInputs = [ makeWrapper pkgconfig efl python2Packages.python python2Packages.wrapPython dbus ];
+  pythonPath = [ python2Packages.pythonefl python2Packages.dbus elementary ];
   postInstall = ''
-    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl}/lib/python2.7/site-packages
+    wrapPythonPrograms
   '';
 
   meta = {
-- 
cgit 1.4.1