3
0
Fork 0
forked from mirrors/nixpkgs

Update XNeur

svn path=/nixpkgs/trunk/; revision=27294
This commit is contained in:
Michael Raskin 2011-05-24 15:00:56 +00:00
parent 5a2745ae1c
commit 1e868ce18b
2 changed files with 6 additions and 3 deletions

View file

@ -1,5 +1,6 @@
{ stdenv, fetchurl, pkgconfig, xorg, pcre, GStreamer, glib, libxml2
, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant }:
, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant,
gdk_pixbuf}:
let s = import ./src-for-default.nix; in
@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ xorg.libX11 pkgconfig pcre GStreamer glib libxml2 aspell cairo
xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify
gtk pango enchant
gtk pango enchant gdk_pixbuf
];
preConfigure = ''
@ -27,6 +28,8 @@ stdenv.mkDerivation rec {
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_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf}/include/gdk-pixbuf-2.0"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf}/lib/gdk-pixbuf-2.0/include"
export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify"
'';

View file

@ -7125,7 +7125,7 @@ let
xneur = callPackage ../applications/misc/xneur {
GStreamer=gst_all.gstreamer;
inherit (gtkLibs) glib gtk pango atk;
inherit (gtkLibs) glib gtk pango atk gdk_pixbuf;
};
xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix {