diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index f2393a23dfe..5e525ad46af 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 mono gtk-sharp-2_0 ] ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]); + patches = [ ./fix-mono-path.patch ]; + preConfigure = '' ./bootstrap-${lib.versions.majorMinor version} ''; diff --git a/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch b/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch new file mode 100644 index 00000000000..706f119c8ba --- /dev/null +++ b/pkgs/development/libraries/gnome-sharp/fix-mono-path.patch @@ -0,0 +1,13 @@ +diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am +index a0ee802..8260694 100644 +--- a/sample/gconf/Makefile.am ++++ b/sample/gconf/Makefile.am +@@ -22,7 +22,7 @@ sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES) $(ASSEMBLIES) + $(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES) + + Settings.cs: $(SCHEMA) +- MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs ++ MONO_PATH=$(top_builddir)/gconf/GConf/:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs + + CLEANFILES = sample.exe Settings.cs + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f5b089be81b..a4c800839e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11019,7 +11019,7 @@ in gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { }; - gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; }; + gnome-sharp = callPackage ../development/libraries/gnome-sharp { }; gnome-menus = callPackage ../development/libraries/gnome-menus { };