diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index b532f3283d48..0ea9810e8ae4 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,5 +1,8 @@ { fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis, libmpeg2 -, ffmpeg, exiv2, libgsf, rpm, pkgconfig, glib, gtk }: +, ffmpeg, exiv2, libgsf, rpm, pkgconfig +, gtkSupport ? true, glib ? null, gtk ? null}: + +assert gtkSupport -> glib != null && gtk != null; stdenv.mkDerivation rec { name = "libextractor-0.6.2"; @@ -18,8 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ libtool gettext zlib bzip2 flac libvorbis libmpeg2 exiv2 ffmpeg libgsf rpm - pkgconfig glib gtk - ]; + pkgconfig + ] ++ stdenv.lib.optionals gtkSupport [ glib gtk ]; configureFlags = "--disable-ltdl-install " + "--with-ltdl-include=${libtool}/include " diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 9d36bc3d5f24..01891ccf3603 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,7 +1,10 @@ { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 -, glib, gettext, intltool, bzip2, gdk_pixbuf -, gnome_vfs, libbonobo, python }: +, gettext, intltool, bzip2, python +, gnomeSupport ? true, glib ? null, gdk_pixbuf ? null +, gnome_vfs ? null, libbonobo ? null }: +assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null + && glib != null; stdenv.mkDerivation rec { name = "libgsf-1.14.22"; @@ -13,9 +16,11 @@ stdenv.mkDerivation rec { buildNativeInputs = [ intltool pkgconfig ]; buildInputs = - [ perl perlXMLParser gettext bzip2 gnome_vfs python gdk_pixbuf ]; + [ perl perlXMLParser gettext bzip2 gnome_vfs python ] + ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf python ]; - propagatedBuildInputs = [ glib libxml2 libbonobo ]; + propagatedBuildInputs = [ libxml2 ] + ++ stdenv.lib.optionals gnomeSupport [ libbonobo glib ]; doCheck = true;