From 22065c11d9fab55418d826d80fcdac12671575f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Thu, 4 Mar 2010 14:44:56 +0000
Subject: [PATCH] Adding 'awesome' (and two packages it was depending on)

svn path=/nixpkgs/trunk/; revision=20385
---
 .../window-managers/awesome/default.nix       | 30 +++++++++++++++++++
 .../libraries/libxdg-basedir/default.nix      | 15 ++++++++++
 .../startup-notification/default.nix          | 20 +++++++++++++
 pkgs/top-level/all-packages.nix               | 20 ++++++++++++-
 4 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/window-managers/awesome/default.nix
 create mode 100644 pkgs/development/libraries/libxdg-basedir/default.nix
 create mode 100644 pkgs/development/libraries/startup-notification/default.nix

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
new file mode 100644
index 00000000000..ff4cd581e68
--- /dev/null
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, xz, cmake, gperf, imagemagick, pkgconfig, lua
+, glib, cairo, pango, imlib2, libxcb, libxdg_basedir, xcbutil,
+libstartup_notification, libev}:
+
+stdenv.mkDerivation rec {
+  name = "awesome-3.4.4";
+ 
+  src = fetchurl {
+    url = http://awesome.naquadah.org/download/awesome-3.4.4.tar.xz;
+    sha256 = "1d1ida8mznn02pzj2kfh6m59mwrz8vk1cy66npgyfpzyrv8a558y";
+  };
+ 
+  buildInputs = [ xz cmake gperf imagemagick pkgconfig lua glib cairo pango
+    imlib2 libxcb libxdg_basedir xcbutil libstartup_notification libev ];
+
+  # Somehow libev does not get into the rpath, although it should.
+  # Something may be wrong in the gcc wrapper.
+  preBuild = ''
+    export NIX_LDFLAGS_BEFORE="-lev";
+  '';
+
+  # Cmake fails strangely at finding lua. Looks to me like a cmake 2.8 error.
+  cmakeFlags = [ "-DLUA_LIBRARIES=${lua}/lib/liblua.a" ];
+ 
+  meta = {
+    homepage = http://awesome.naquadah.org/;
+    description = "Highly configurable, dynamic window manager for X";
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix
new file mode 100644
index 00000000000..4b0c4db2d9c
--- /dev/null
+++ b/pkgs/development/libraries/libxdg-basedir/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "libxdg-basedir-1.0.2";
+  src = fetchurl {
+    url = "http://n.ethz.ch/student/nevillm/download/libxdg-basedir/${name}.tar.gz";
+    sha256 = "0fibbzba228gdk05lfi8cgfrsp80a2gnjbwka0pzpkig0fz8pp9i";
+  };
+
+  meta = {
+    homepage = http://n.ethz.ch/student/nevillm/download/libxdg-basedir/;
+    description = "Implementation of the XDG Base Directory specification";
+    license = "BSD";
+  };
+}
diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix
new file mode 100644
index 00000000000..d989c4059e6
--- /dev/null
+++ b/pkgs/development/libraries/startup-notification/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, libX11, libxcb, pkgconfig, xcbutil}:
+
+let
+  version = "0.10";
+in
+stdenv.mkDerivation {
+  name = "libstartup-notification-${version}";
+  src = fetchurl {
+    url = "http://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz";
+    sha256 = "0nalaay0yj3gq85insp9l31hsv5zp390m4nn37y235v151ffpfv4";
+  };
+
+  buildInputs = [ libX11 libxcb pkgconfig xcbutil ];
+
+  meta = {
+    homepage = http://www.freedesktop.org/software/startup-notification;
+    description = "Application startup notification and feedback library";
+    license = "BSD";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9281609dba9..de41954f378 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3363,7 +3363,7 @@ let
     inherit fetchurl stdenv bison;
   };
 
-  cairo = import ../development/libraries/cairo {
+  cairo = makeOverridable (import ../development/libraries/cairo) {
     inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
     inherit (xlibs) pixman libxcb xcbutil;
   };
@@ -4414,6 +4414,11 @@ let
   libssh = import ../development/libraries/libssh {
     inherit stdenv fetchurl cmake zlib openssl;
   };
+
+  libstartup_notification = import ../development/libraries/startup-notification {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (xlibs) libX11 libxcb xcbutil;
+  };
   
   libtasn1 = import ../development/libraries/libtasn1 {
     inherit fetchurl stdenv;
@@ -4498,6 +4503,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  libxdg_basedir = import ../development/libraries/libxdg-basedir {
+    inherit fetchurl stdenv;
+  };
+
   libxklavier = import ../development/libraries/libxklavier {
     inherit fetchurl stdenv xkeyboard_config pkgconfig libxml2 isocodes glib;
     inherit (xorg) libX11 libICE libXi libxkbfile;
@@ -6721,6 +6730,15 @@ let
     inherit (xlibs) libXv pixman libpthreadstubs libXau libXdmcp;
   };
 
+  awesome = import ../applications/window-managers/awesome {
+    inherit fetchurl stdenv xz cmake gperf imagemagick pkgconfig imlib2 libxdg_basedir
+      libstartup_notification libev;
+    inherit (gtkLibs) glib pango;
+    inherit (xorg) libxcb xcbutil;
+    lua = lua5;
+    cairo = cairo.override { xcbSupport = true; };
+  };
+
   batik = import ../applications/graphics/batik {
     inherit fetchurl stdenv unzip;
   };