fix the problem of missing expat in a few packages
This commit is contained in:
parent
b2a07ce189
commit
684f215b4f
@ -1,5 +1,5 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau
|
{ 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'
|
, 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
|
buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp
|
||||||
lcms2 libiptcdata mercurial ];
|
lcms2 libiptcdata expat mercurial ];
|
||||||
|
|
||||||
# Disable the use of the RAWZOR propietary libraries
|
# Disable the use of the RAWZOR propietary libraries
|
||||||
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
|
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }:
|
{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "kdesvn-1.5.5";
|
name = "kdesvn-1.5.5";
|
||||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||||||
patches = [ ./docbook.patch ./virtual_inheritance.patch ];
|
patches = [ ./docbook.patch ./virtual_inheritance.patch ];
|
||||||
|
|
||||||
|
|
||||||
buildInputs = [ apr aprutil subversion db4 kdelibs ];
|
buildInputs = [ apr aprutil subversion db4 kdelibs expat ];
|
||||||
|
|
||||||
buildNativeInputs = [ gettext ];
|
buildNativeInputs = [ gettext ];
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig }:
|
{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig, expat }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "dbus-cplusplus-${version}";
|
name = "dbus-cplusplus-${version}";
|
||||||
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw";
|
sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ dbus glib gtkmm pkgconfig ];
|
buildInputs = [ dbus glib gtkmm pkgconfig expat ];
|
||||||
|
|
||||||
configureFlags = "--disable-ecore";
|
configureFlags = "--disable-ecore";
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user