1 files changed, 13 insertions, 8 deletions
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index 35576baeb328..56f6242c09e8 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,21 +1,26 @@
-{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
-, python, libiconvOrEmpty
-}:
+{ fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2
+, gettext, intltool, bzip2, glib, python
+, gnomeSupport ? true,  gdk_pixbuf ? null
+, gnome_vfs ? null, libbonobo ? null }:
 
-with { inherit (stdenv.lib) optionals; };
+assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null
+  && glib != null;
 
 stdenv.mkDerivation rec {
   name = "libgsf-1.14.25";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz";
-    sha256 = "18ni8hwi3q83vs3m6mg6xwd4g7jvss4kz70kzf21k587gvq4hx8j";
+    sha256 = "127548f07e07951984fb139c3f89d65b9e471aefe6555387de03e1113944d1a2";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ];
-  buildInputs = [ gettext bzip2 zlib python ];
+  nativeBuildInputs = [ intltool pkgconfig ];
+  buildInputs =
+    [ perl perlXMLParser gettext bzip2 python ]
+    ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ];
 
-  propagatedBuildInputs = [ libxml2 glib ] ++ libiconvOrEmpty;
+  propagatedBuildInputs = [ libxml2 glib ]
+    ++ stdenv.lib.optionals gnomeSupport [ libbonobo ];
 
   doCheck = true;