From 39d02d873fec73e818d7d41e6b70f777d0882132 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 5 Aug 2009 10:25:17 +0000
Subject: [PATCH] Update XNeur

svn path=/nixpkgs/trunk/; revision=16589
---
 pkgs/applications/misc/xneur/default.nix | 20 ++++++++++++++++----
 pkgs/top-level/all-packages.nix          |  7 ++++---
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 7e5fad64c01..a1cfd73770c 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,14 +1,16 @@
 args: with args;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+  version = "0.9.5";
   name="xneur";
   src = fetchurl {
-    url = http://dists.xneur.ru/release-0.9.3/tgz/xneur-0.9.3.tar.bz2;
-    sha256 = "14pjsxajbibjl70yrvina3kk2114h3i7bgyqlxpjkfcz2778qq12";
+    url = "http://dists.xneur.ru/release-${version}/tgz/${name}-${version}.tar.bz2";
+    sha256 = "06rl7blpyhm61p5hyip55z8gdra6z89d8h4g4mbn4cbs8hd8hq8w";
   };
 
   buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
-    libXpm imlib2 xosd libXt libXext];
+    libXpm imlib2 xosd libXt libXext libXi libnotify gtk pango
+    cairo];
 
   inherit aspell imlib2 xosd;
 
@@ -17,10 +19,20 @@ stdenv.mkDerivation {
     sed -e 's/for aspell_dir in/for aspell_dir in $aspell /' -i configure
     sed -e 's/for imlib2_dir in/for imlib2_dir in $imlib2 /' -i configure
     sed -e 's/for xosd_dir in/for xosd_dir in $xosd /' -i configure
+
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango}/include/pango-1.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
+
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify"
   '';
 
   meta = {
     description = "xneur is the keyboard layout switcher.";
+    homepage = http://xneur.ru;
+    license = "GPL2+";
   };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93f40efdd54..dbc57abf145 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7275,10 +7275,11 @@ let
   };
 
   xneur = import ../applications/misc/xneur {
-    inherit fetchurl stdenv pkgconfig pcre libxml2 aspell imlib2 xosd;
+    inherit fetchurl stdenv pkgconfig pcre libxml2 aspell imlib2
+      xosd libnotify cairo;
     GStreamer=gst_all.gstreamer;
-    inherit (xlibs) libX11 libXpm libXt libXext;
-    inherit (gtkLibs) glib;
+    inherit (xlibs) libX11 libXpm libXt libXext libXi;
+    inherit (gtkLibs) glib gtk pango atk;
   };
 
   xneur_0_8 = import ../applications/misc/xneur/0.8.nix {