git.iko.soy/typeable/nixpkgs
on master help sign in
gnome-sharp: mono4 -> mono5
commitee684213889cae36a7867d9507ef432acf2ce69f authorJiri Danek <jdanek@redhat.com> dateWed 7 Aug 2019, 07:45 (7 years ago) parentbb6ef06
3 files changed+16−1
pkgs/development/libraries/gnome-sharp/default.nix+2 pkgs/development/libraries/gnome-sharp/fix-mono-path.patch+13 pkgs/top-level/all-packages.nix+1−1
pkgs/development/libraries/gnome-sharp/default.nix+2
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
2727 buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
2828 ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
2929
30+ patches = [ ./fix-mono-path.patch ];
31+
3032 preConfigure = ''
3133 ./bootstrap-${lib.versions.majorMinor version}
3234 '';
pkgs/development/libraries/gnome-sharp/fix-mono-path.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/sample/gconf/Makefile.am b/sample/gconf/Makefile.am
2+index a0ee802..8260694 100644
3+--- a/sample/gconf/Makefile.am
4++++ b/sample/gconf/Makefile.am
5+@@ -22,7 +22,7 @@ sample.exe: $(SCHEMA) $(srcdir)/sample.glade $(FILES) $(ASSEMBLIES)
6+ $(CSC) /out:sample.exe $(FILES) $(REFERENCES) $(RESOURCES)
7+
8+ Settings.cs: $(SCHEMA)
9+- MONO_PATH=$(top_builddir)/gconf/GConf/gconf-sharp.dll:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs
10++ MONO_PATH=$(top_builddir)/gconf/GConf/:${MONO_PATH} $(RUNTIME) $(GCONFDIR)/tools/gconfsharp-schemagen.exe Sample $(SCHEMA) > Settings.cs
11+
12+ CLEANFILES = sample.exe Settings.cs
13+
pkgs/top-level/all-packages.nix+1−1
@@ -11019,7 +11019,7 @@ in
1101911019
1102011020 gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
1102111021
11022− gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; };
11022+ gnome-sharp = callPackage ../development/libraries/gnome-sharp { };
1102311023
1102411024 gnome-menus = callPackage ../development/libraries/gnome-menus { };
1102511025