* gconf -> GConf.

svn path=/nixpkgs/trunk/; revision=3201
This commit is contained in:
Eelco Dolstra 2005-06-17 20:21:29 +00:00
parent a6dd440024
commit 4daec2efd0
3 changed files with 7 additions and 6 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp { stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
, gtkmozembedsharp, monodoc , gtkmozembedsharp, monodoc
, perl, perlXMLParser, pkgconfig , perl, perlXMLParser, pkgconfig
, glib, gtk, gconf, gnomevfs, libbonobo, libglade, libgnome , glib, gtk, GConf, gnomevfs, libbonobo, libglade, libgnome
, mozilla , mozilla
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
glib gtk gconf gnomevfs libbonobo libglade libgnome glib gtk GConf gnomevfs libbonobo libglade libgnome
gtkmozembedsharp monodoc gtkmozembedsharp monodoc
]; ];

View File

@ -1,5 +1,5 @@
{ input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig { input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig
, gtk, libxml2, libgnomeprint, gnomevfs, libbonobo, gconf , gtk, libxml2, libgnomeprint, gnomevfs, libbonobo, GConf
, libgnomeprintui, libgnomecanvas , libgnomeprintui, libgnomecanvas
}: }:
@ -7,7 +7,7 @@ stdenv.mkDerivation {
inherit (input) name src; inherit (input) name src;
buildInputs = [ buildInputs = [
perl perlXMLParser pkgconfig gnomevfs perl perlXMLParser pkgconfig gnomevfs
libbonobo gconf libgnomeprintui libgnomecanvas libbonobo GConf libgnomeprintui libgnomecanvas
]; ];
propagatedBuildInputs = [gtk libxml2 libgnomeprint]; propagatedBuildInputs = [gtk libxml2 libgnomeprint];
} }

View File

@ -583,7 +583,8 @@ rec {
libxml2 = (import ../development/libraries/libxml2) { libxml2 = (import ../development/libraries/libxml2) {
inherit fetchurl stdenv zlib python; inherit fetchurl stdenv zlib python;
pythonSupport = stdenv.system == "i686-linux"; # pythonSupport = stdenv.system == "i686-linux";
pythonSupport = false;
}; };
libxslt = (import ../development/libraries/libxslt) { libxslt = (import ../development/libraries/libxslt) {
@ -1236,7 +1237,7 @@ rec {
monodevelop = (import ../applications/editors/monodevelop) { monodevelop = (import ../applications/editors/monodevelop) {
inherit fetchurl stdenv file mono gtksourceviewsharp inherit fetchurl stdenv file mono gtksourceviewsharp
gtkmozembedsharp monodoc perl perlXMLParser pkgconfig; 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; mozilla = firefox;
gtksharp = gtksharp2; gtksharp = gtksharp2;
}; };