From 1e868ce18b128adb5304a6f3ffa5e89dcde66f35 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 24 May 2011 15:00:56 +0000 Subject: [PATCH] Update XNeur svn path=/nixpkgs/trunk/; revision=27294 --- pkgs/applications/misc/xneur/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index c7a302c6589..bdaaaa43c74 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -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" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72dc23bf5d3..0d6f7e48244 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {