pkgs/desktops/e17: Some fixes and now I can start it! \o/

svn path=/nixpkgs/trunk/; revision=29518

2 files changed, 12 insertions, 5 deletions

diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix
index d3d74cac82a9..b21bfc92ef2a 100644
--- a/pkgs/desktops/e17/enlightenment/default.nix
+++ b/pkgs/desktops/e17/enlightenment/default.nix
@@ -1,12 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus }:
+{ stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }:
 stdenv.mkDerivation rec {
   name = "enlightenment-0.16.999.55225";
   src = fetchurl {
     url = "http://download.enlightenment.org/snapshots/2010-12-03/${name}.tar.gz";
     sha256 = "1cv701fidp9mx3g5m9klmzsp0fj149rb133v1w76rzms3a0wljl1";
   };
-  buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus ];
-  configureFlags = "--with-profile=FAST_PC";
+  buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ];
+  configureFlags = ''
+    --with-profile=FAST_PC
+    --disable-illume
+    --disable-illume2
+  '';
   meta = {
     description = "Enlightenment, the window manager";
     longDescription = ''
diff --git a/pkgs/desktops/e17/evas/default.nix b/pkgs/desktops/e17/evas/default.nix
index 9d7edc89c21c..c546eb1af54a 100644
--- a/pkgs/desktops/e17/evas/default.nix
+++ b/pkgs/desktops/e17/evas/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, eina, freetype }:
+{ stdenv, fetchurl, pkgconfig, freetype, fontconfig, libpng, libjpeg
+, libX11, libXext, eina, eet }:
 stdenv.mkDerivation rec {
   name = "evas-${version}";
   version = "1.0.1";
@@ -6,7 +7,9 @@ stdenv.mkDerivation rec {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
     sha256 = "0xkwyvxy32dwja0i3j8r8bzlybjwlrgmrhcri1bscp3aaj75x2rx";
   };
-  buildInputs = [ pkgconfig eina freetype ];
+  buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg
+                  libX11 libXext eina eet
+                ];
   meta = {
     description = "Enlightenment's canvas and scenegraph rendering library";
     longDescription = ''