summary refs log tree commit diff
path: root/pkgs/desktops/enlightenment
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/desktops/enlightenment')
-rw-r--r--pkgs/desktops/enlightenment/default.nix3
-rw-r--r--pkgs/desktops/enlightenment/econnman.nix12
-rw-r--r--pkgs/desktops/enlightenment/efl.nix22
-rw-r--r--pkgs/desktops/enlightenment/elementary.nix21
-rw-r--r--pkgs/desktops/enlightenment/emotion.nix18
-rw-r--r--pkgs/desktops/enlightenment/enlightenment.nix22
-rw-r--r--pkgs/desktops/enlightenment/evas.nix17
-rw-r--r--pkgs/desktops/enlightenment/rage.nix32
-rw-r--r--pkgs/desktops/enlightenment/terminology.nix19
9 files changed, 76 insertions, 90 deletions
diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix
index b285498be9dc..2129005ab01e 100644
--- a/pkgs/desktops/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/default.nix
@@ -2,9 +2,6 @@
 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 { };
diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix
index 9cde3cf45943..60e63dc68ed9 100644
--- a/pkgs/desktops/enlightenment/econnman.nix
+++ b/pkgs/desktops/enlightenment/econnman.nix
@@ -1,14 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, efl, elementary, python2Packages, dbus, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, efl, python2Packages, 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 python2Packages.python python2Packages.wrapPython dbus ];
-  pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python elementary ];
+  nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ];
+
+  buildInputs = [ efl python2Packages.python dbus ];
+
+  pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ];
+
   postInstall = ''
     wrapPythonPrograms
   '';
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 218de3bfa7cd..b8b3d82ccb60 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -1,19 +1,18 @@
-{ 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, systemd }:
-
+{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, 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, ghostscript, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }:
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.17.2";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
-    sha256 = "1dpq5flygrjg931nzsr2ra8icqffzrzbs1lnrzarbpsbmgq3zacs";
+    sha256 = "17mzbjmz8d2vs8p63r1sk3mppl3l2fhxy2jv24dp75lgqbsvp806";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
-    giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
+  buildInputs = [ openssl zlib lz4 freetype fontconfig fribidi SDL2 SDL mesa
+    giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
     xorg.libX11 udev utillinux systemd ];
 
@@ -21,22 +20,19 @@ stdenv.mkDerivation rec {
     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
+    harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript 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"
+  configureFlags = [ "--enable-sdl" "--enable-drm" "--enable-elput" "--with-opengl=full"
+    "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-liblz4" "--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.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
-
   patches = [ ./efl-elua.patch ];
 
   preConfigure = ''
-    export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base.dev}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
     export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
   '';
 
@@ -50,7 +46,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    description = "Enlightenment Core libraries";
+    description = "Enlightenment foundation libraries";
     homepage = http://enlightenment.org/;
     maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/desktops/enlightenment/elementary.nix b/pkgs/desktops/enlightenment/elementary.nix
deleted file mode 100644
index 10334eb98e96..000000000000
--- a/pkgs/desktops/enlightenment/elementary.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, efl, libcap, automake, autoconf, libdrm, gdbm }:
-stdenv.mkDerivation rec {
-  name = "elementary-${version}";
-  version = "1.17.1";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz";
-    sha256 = "149xjq4z71l44w1kd8zks9b2g0wjc9656w46hzd27b58afj1dqc5";
-  };
-  nativeBuildInputs = [ pkgconfig automake autoconf ];
-  buildInputs = [ efl libdrm gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
-  NIX_CFLAGS_COMPILE = [ "-I${libdrm.dev}/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/emotion.nix b/pkgs/desktops/enlightenment/emotion.nix
deleted file mode 100644
index 39b3b1620751..000000000000
--- a/pkgs/desktops/enlightenment/emotion.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, efl, vlc }:
-stdenv.mkDerivation rec {
-  name = "emotion_generic_players-${version}";
-  version = "1.17.0";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz";
-    sha256 = "03kaql95mk0c5j50v3c5i5lmlr3gz7xlh8p8q87xz8zf9j5h1pp7";
-  };
-  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
index f490e030c657..f4ff94ad088e 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,23 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, efl, elementary, xcbutilkeysyms, libXrandr, libXdmcp, libxcb,
-libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mesa_glu
-, xkeyboard_config }:
+{ stdenv, fetchurl, pkgconfig, efl, xcbutilkeysyms, libXrandr, libXdmcp,
+libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap,
+mesa_glu , xkeyboard_config }:
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.21.1";
+  version = "0.21.2";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "119sxrgrz163c01yx0q9n2jpmmbv0a58akmz0c2z4xy37f1m02rx";
+    sha256 = "0fi5dxrprnvhnn2y51gnfpsjj44snriqi20k20a73vhaqxfn8xx8";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ efl elementary libXdmcp libxcb
-    xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libuuid
+  buildInputs = [ efl libXdmcp libxcb
+    xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2
     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" ];
+  NIX_CFLAGS_COMPILE = [
+    "-I${efl}/include/ecore-imf-1"
+    "-I${efl}/include/emile-1"
+    "-I${efl}/include/eo-1"
+    "-I${efl}/include/ethumb-1"
+    "-I${efl}/include/ethumb-client-1"
+  ];
 
   preConfigure = ''
     export USER_SESSION_DIR=$prefix/lib/systemd/user
diff --git a/pkgs/desktops/enlightenment/evas.nix b/pkgs/desktops/enlightenment/evas.nix
deleted file mode 100644
index fe8897b8be7a..000000000000
--- a/pkgs/desktops/enlightenment/evas.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ 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.17.0";
-  src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz";
-    sha256 = "0ynq1nx0bfgg19p4vki1fap36yyip53zaxpzncx2slr6jcx1kxf2";
-  };
-  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
index 67f9c68cd613..9ef557654dc7 100644
--- a/pkgs/desktops/enlightenment/rage.nix
+++ b/pkgs/desktops/enlightenment/rage.nix
@@ -1,15 +1,36 @@
-{ stdenv, fetchurl, elementary, efl, automake, autoconf, libtool, pkgconfig, gst_all_1
+{ stdenv, fetchurl, efl, automake, autoconf, libtool, pkgconfig, gst_all_1
 , makeWrapper, lib }:
+
 stdenv.mkDerivation rec {
   name = "rage-${version}";
-  version = "0.1.4";
+  version = "0.2.0";
+  
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz";
-    sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg";
+    sha256 = "06fxhznwbd5x341r8ml3cpwmvwn0aq9i1akcgclk4vjdqiyff1d9";
   };
+
+  nativeBuildInputs = [
+    automake autoconf libtool pkgconfig makeWrapper
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${efl}/include/ecore-con-1"
+    "-I${efl}/include/ecore-evas-1"
+    "-I${efl}/include/ecore-file-1"
+    "-I${efl}/include/ecore-imf-1"
+    "-I${efl}/include/ecore-input-1"
+    "-I${efl}/include/eet-1"
+    "-I${efl}/include/efreet-1"
+    "-I${efl}/include/eldbus-1"
+    "-I${efl}/include/emile-1"
+    "-I${efl}/include/eo-1"
+    "-I${efl}/include/ethumb-1"
+    "-I${efl}/include/ethumb-client-1"
+  ];
+
   buildInputs = [
-    elementary efl automake autoconf libtool pkgconfig
-    makeWrapper
+    efl
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
@@ -25,6 +46,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/rage \
       --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
   '';
+
   meta = {
     description = "Video + Audio player along the lines of mplayer";
     homepage = http://enlightenment.org/;
diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index a302b7d5f612..34506c05fabe 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -1,12 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, efl, elementary }:
+{ stdenv, fetchurl, pkgconfig, efl }:
+
 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 ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ efl ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${efl}/include/ecore-con-1"
+    "-I${efl}/include/eldbus-1"
+    "-I${efl}/include/elocation-1"
+    "-I${efl}/include/emile-1"
+    "-I${efl}/include/eo-1"
+    "-I${efl}/include/ethumb-1"
+  ];
+
   meta = {
     description = "The best terminal emulator written with the EFL";
     homepage = http://enlightenment.org/;
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-19 03:42:30 +0000