From 46f022b4ce340040d3b3bc33acf0ea1a65333aad Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 11 Jan 2009 10:19:11 +0000
Subject: [PATCH] Fixed dependencies for updated Xneur
svn path=/nixpkgs/trunk/; revision=13735
---
pkgs/applications/misc/xneur/default.nix | 6 ++++--
pkgs/top-level/all-packages.nix | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index 708fa4c24bce..7e5fad64c015 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -8,13 +8,15 @@ stdenv.mkDerivation {
};
buildInputs = [libX11 pkgconfig pcre GStreamer glib libxml2 aspell
- libXpm];
+ libXpm imlib2 xosd libXt libXext];
- inherit aspell;
+ inherit aspell imlib2 xosd;
preConfigure = ''
sed -e 's/-Werror//' -i configure
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
'';
meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3e6227f60c8..211301bf74b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8245,9 +8245,9 @@ let
};
xneur = import ../applications/misc/xneur {
- inherit fetchurl stdenv pkgconfig pcre libxml2 aspell;
+ inherit fetchurl stdenv pkgconfig pcre libxml2 aspell imlib2 xosd;
GStreamer=gst_all.gstreamer;
- inherit (xlibs) libX11 libXpm;
+ inherit (xlibs) libX11 libXpm libXt libXext;
inherit (gtkLibs) glib;
};