From e9178614a9e9dcaff4527a72820ce824d274748e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Mar 2007 13:44:27 +0000
Subject: [PATCH] * Added feh to set the root image. * Compiz extra plugins.

svn path=/nixpkgs/trunk/; revision=8178
---
 pkgs/applications/graphics/feh/default.nix    | 30 +++++++++++++++++++
 .../window-managers/compiz/default.nix        |  8 +++--
 .../window-managers/compiz/extra.nix          | 16 ++++++++++
 pkgs/development/libraries/imlib2/default.nix | 10 +++++++
 pkgs/top-level/all-packages.nix               | 14 +++++++++
 5 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/graphics/feh/default.nix
 create mode 100644 pkgs/applications/window-managers/compiz/extra.nix
 create mode 100644 pkgs/development/libraries/imlib2/default.nix

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
new file mode 100644
index 00000000000..f234432dc56
--- /dev/null
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, x11, imlib2, libjpeg, libpng}:
+
+let
+
+  giblib = stdenv.mkDerivation {
+    name = "giblib-1.2.4";
+    src = fetchurl {
+      url = http://linuxbrit.co.uk/downloads/giblib-1.2.4.tar.gz;
+      sha256 = "1b4bmbmj52glq0s898lppkpzxlprq9aav49r06j2wx4dv3212rhp";
+    };
+    buildInputs = [x11 imlib2];
+  };
+
+in
+  
+stdenv.mkDerivation {
+  name = "feh-1.3.4";
+
+  src = fetchurl {
+    url = http://linuxbrit.co.uk/downloads/feh-1.3.4.tar.gz;
+    sha256 = "091iz2id5z80vn2qxg0ipwncv5bv8i9ifw2q15ja9zazq6xz5fc1";
+  };
+
+  buildInputs = [x11 imlib2 giblib libjpeg libpng];
+
+  meta = {
+    description = "A light-weight image viewer";
+    url = http://linuxbrit.co.uk/feh/;
+  };
+}
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index bf37e0db585..b7005c2e62e 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -14,9 +14,11 @@ stdenv.mkDerivation {
     sha256 = "1hi53ajypmgsyfz7cziccdk9f8mn3pfl255yjzl0v15nv5kacmiq";
   };
   buildInputs = [
-    pkgconfig libpng libXcomposite libXfixes libXdamage libXrandr
-    libXinerama libICE libSM startupnotification libXrender xextproto
-    mesa gtk libwnck GConf
+    pkgconfig libXrender xextproto gtk libwnck GConf
+  ];
+  propagatedBuildInputs = [
+    libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
+    libICE libSM startupnotification mesa
   ];
   configureFlags = "--enable-gtk";
 }
diff --git a/pkgs/applications/window-managers/compiz/extra.nix b/pkgs/applications/window-managers/compiz/extra.nix
new file mode 100644
index 00000000000..af2671945d2
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz/extra.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, compiz, perl, perlXMLParser, GConf, dbus, gtk
+}:
+
+stdenv.mkDerivation {
+  name = "compiz-extra-20070305";
+  src = fetchurl {
+    url = http://gandalfn.club.fr/ubuntu/compiz-extra/compiz-extra-latest.tar.bz2;
+    sha256 = "1cm5cayhpnlhj0fhg8lqghdk52h9gmv4jv98zzadj3r3fd8mwr9z";
+  };
+  buildInputs = [
+    pkgconfig compiz perl perlXMLParser GConf dbus gtk
+  ];
+  preBuild = "
+    makeFlagsArray=(moduledir=$out/lib/compiz)
+  ";
+}
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
new file mode 100644
index 00000000000..46cb9cce658
--- /dev/null
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, x11, libjpeg, libtiff, libungif, libpng}:
+
+stdenv.mkDerivation {
+  name = "imlib2-1.3.0";
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/enlightenment/imlib2-1.3.0.tar.gz;
+    sha256 = "1lrg7haqhmzpdb14cgp9vny5fanlwlyhf5n017v130in297gv1qj";
+  };
+  buildInputs = [x11 libjpeg libtiff libungif libpng];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c572c3e2ec..98f092ee6a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1415,6 +1415,10 @@ rec {
     inherit (xlibs) libX11 libXext xextproto;
   };
 
+  imlib2 = import ../development/libraries/imlib2 {
+    inherit fetchurl stdenv x11 libjpeg libtiff libungif libpng;
+  };
+
   lcms = import ../development/libraries/lcms {
     inherit fetchurl stdenv;
   };
@@ -2545,6 +2549,12 @@ rec {
     inherit (gtkLibs) gtk;
   };
 
+  compizExtra = import ../applications/window-managers/compiz/extra.nix {
+    inherit fetchurl stdenv pkgconfig compiz perl perlXMLParser dbus;
+    inherit (gnome) GConf;
+    inherit (gtkLibs) gtk;
+  };
+
   cua = import ../applications/editors/emacs-modes/cua {
     inherit fetchurl stdenv;
   };
@@ -2601,6 +2611,10 @@ rec {
     inherit (gtkLibs) glib;
   };
 
+  feh = import ../applications/graphics/feh {
+    inherit fetchurl stdenv x11 imlib2 libjpeg libpng;
+  };
+
   firefox = import ../applications/networking/browsers/firefox {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
     inherit (gtkLibs) gtk;