gnome-sharp: mono4 -> mono5

This commit is contained in:
Jiri Danek 2019-08-07 07:45:53 +02:00 committed by Vincent Laporte
parent bb6ef0646a
commit ee68421388
3 changed files with 16 additions and 1 deletions

View file

@ -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}
'';

View file

@ -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

View file

@ -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 { };