Update XNeur

svn path=/nixpkgs/trunk/; revision=16589
This commit is contained in:
Michael Raskin 2009-08-05 10:25:17 +00:00
parent a82d1e3d63
commit 39d02d873f
2 changed files with 20 additions and 7 deletions

View File

@ -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+";
};
}

View File

@ -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 {