From 6163742ea4f21cde506aa31ef4209de1db11fcab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Wed, 11 Jul 2012 20:15:06 +0200 Subject: [PATCH] libgsf: fix build without gnome support I recently committed it with broken without-gnome support. --- pkgs/development/libraries/libgsf/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 01891ccf360..3941fd4d694 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 -, gettext, intltool, bzip2, python -, gnomeSupport ? true, glib ? null, gdk_pixbuf ? null +, gettext, intltool, bzip2, glib, python +, gnomeSupport ? true, gdk_pixbuf ? null , gnome_vfs ? null, libbonobo ? null }: assert gnomeSupport -> gdk_pixbuf != null && gnome_vfs != null && libbonobo != null @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { buildNativeInputs = [ intltool pkgconfig ]; buildInputs = - [ perl perlXMLParser gettext bzip2 gnome_vfs python ] - ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf python ]; + [ perl perlXMLParser gettext bzip2 python ] + ++ stdenv.lib.optionals gnomeSupport [ gnome_vfs gdk_pixbuf ]; - propagatedBuildInputs = [ libxml2 ] - ++ stdenv.lib.optionals gnomeSupport [ libbonobo glib ]; + propagatedBuildInputs = [ libxml2 glib ] + ++ stdenv.lib.optionals gnomeSupport [ libbonobo ]; doCheck = true;