diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index c7400b5cf43f..57a7207546a3 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp , gtkmozembedsharp, monodoc , perl, perlXMLParser, pkgconfig -, glib, gtk, gconf, gnomevfs, libbonobo, libglade, libgnome +, glib, gtk, GConf, gnomevfs, libbonobo, libglade, libgnome , mozilla }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig - glib gtk gconf gnomevfs libbonobo libglade libgnome + glib gtk GConf gnomevfs libbonobo libglade libgnome gtkmozembedsharp monodoc ]; diff --git a/pkgs/development/libraries/gnome/gtksourceview/default.nix b/pkgs/development/libraries/gnome/gtksourceview/default.nix index 3b1380775280..8ad7955e8d40 100644 --- a/pkgs/development/libraries/gnome/gtksourceview/default.nix +++ b/pkgs/development/libraries/gnome/gtksourceview/default.nix @@ -1,5 +1,5 @@ { input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig -, gtk, libxml2, libgnomeprint, gnomevfs, libbonobo, gconf +, gtk, libxml2, libgnomeprint, gnomevfs, libbonobo, GConf , libgnomeprintui, libgnomecanvas }: @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit (input) name src; buildInputs = [ perl perlXMLParser pkgconfig gnomevfs - libbonobo gconf libgnomeprintui libgnomecanvas + libbonobo GConf libgnomeprintui libgnomecanvas ]; propagatedBuildInputs = [gtk libxml2 libgnomeprint]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index bd1986a302f2..0d7be58322c8 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -583,7 +583,8 @@ rec { libxml2 = (import ../development/libraries/libxml2) { inherit fetchurl stdenv zlib python; - pythonSupport = stdenv.system == "i686-linux"; +# pythonSupport = stdenv.system == "i686-linux"; + pythonSupport = false; }; libxslt = (import ../development/libraries/libxslt) { @@ -1236,7 +1237,7 @@ rec { monodevelop = (import ../applications/editors/monodevelop) { inherit fetchurl stdenv file mono gtksourceviewsharp gtkmozembedsharp monodoc perl perlXMLParser pkgconfig; - inherit (gnome) gnomevfs libbonobo libglade libgnome gconf glib gtk; + inherit (gnome) gnomevfs libbonobo libglade libgnome GConf glib gtk; mozilla = firefox; gtksharp = gtksharp2; };