From 684f215b4f4bb1a9850f9b0682ad4aa1069e4f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 11 Feb 2013 18:34:40 +0100 Subject: [PATCH] fix the problem of missing expat in a few packages --- pkgs/applications/graphics/rawtherapee/default.nix | 4 ++-- pkgs/applications/version-management/kdesvn/default.nix | 4 ++-- pkgs/development/libraries/dbus-cplusplus/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 328181790ac..67723dd5818 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau -, libXdmcp, lcms2, libiptcdata +, libXdmcp, lcms2, libiptcdata, expat , mercurial # Not really needed for anything, but it fails if it does not find 'hg' }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms2 libiptcdata mercurial ]; + lcms2 libiptcdata expat mercurial ]; # Disable the use of the RAWZOR propietary libraries cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index 7761c45850e..c466102c203 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }: +{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }: stdenv.mkDerivation rec { name = "kdesvn-1.5.5"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ ./docbook.patch ./virtual_inheritance.patch ]; - buildInputs = [ apr aprutil subversion db4 kdelibs ]; + buildInputs = [ apr aprutil subversion db4 kdelibs expat ]; buildNativeInputs = [ gettext ]; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 2704b9586b1..0a4b80d3f3e 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig }: +{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig, expat }: stdenv.mkDerivation rec { name = "dbus-cplusplus-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw"; }; - buildInputs = [ dbus glib gtkmm pkgconfig ]; + buildInputs = [ dbus glib gtkmm pkgconfig expat ]; configureFlags = "--disable-ecore";