Merge pull request #52800 from obadz/mono

mono: more fixes and update gtk-sharp/gnome-sharp

pkgs/development/libraries/gnome-sharp/Makefile.in.patch

@@ -1,11 +0,0 @@
---- a/sample/gnomevfs/Makefile.in	2009-03-03 16:09:52.000000000 +0000
-+++ b/sample/gnomevfs/Makefile.in	2014-10-14 13:35:51.020427244 +0100
-@@ -218,7 +218,7 @@
- 
- @ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS = 
- @ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS = 
--@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe
-+@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS =
- assemblies = ../../gnomevfs/gnome-vfs-sharp.dll
- references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies))
- noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS)

pkgs/development/libraries/gnome-sharp/default.nix

@@ -1,17 +1,35 @@
-{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}:
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkgconfig
+, gtk2
+, mono
+, gtk-sharp-2_0
+, gnome2
+, autoconf
+, automake
+, libtool
+, which
+}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "gnome-sharp-2.24.1";
+  name = "gnome-sharp-${version}";
-  src = fetchurl {
+  version = "2.24.4";
-    url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz;
+
-    sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p";
+  src = fetchFromGitHub {
+    owner = "mono";
+    repo = "gnome-sharp";
+    rev = "${version}";
+    sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
   buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
-  ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]);
+  ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
 
-  patches = [ ./Makefile.in.patch ];
+  preConfigure = ''
+    ./bootstrap-${lib.versions.majorMinor version}
+  '';
 
   dontStrip = true;
 

pkgs/development/libraries/gtk-sharp/2.0.nix

@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, mono
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkgconfig
+, mono
 , glib
 , pango
 , gtk2
@@ -12,32 +16,44 @@
 , libgnomeprintui ? null
 , libxml2
 , monoDLLFixer
+, autoconf
+, automake
+, libtool
+, which
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "gtk-sharp-2.12.10";
+  name = "gtk-sharp-${version}";
+  version = "2.12.45";
 
   builder = ./builder.sh;
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz;
+    owner = "mono";
-    sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc";
+    repo = "gtk-sharp";
+    rev = version;
+    sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg";
   };
 
-  # patches = [ ./dllmap-glue.patch ];
+  postInstall = ''
-
+    pushd $out/bin
-  # patch bad usage of glib, which wasn't tolerated anymore
+    for f in gapi2-*
-  prePatch = ''
+    do
-    for f in glib/glue/{thread,list,slist}.c; do
+      substituteInPlace $f --replace mono ${mono}/bin/mono
-      sed -i 's,#include <glib/.*\.h>,#include <glib.h>,g' "$f"
     done
+    popd
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
+
   buildInputs = [
     mono glib pango gtk2 GConf libglade libgnomecanvas
     libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
   ];
 
+  preConfigure = ''
+    ./bootstrap-${lib.versions.majorMinor version}
+  '';
+
   dontStrip = true;
 
   inherit monoDLLFixer;

pkgs/top-level/all-packages.nix

@@ -4794,7 +4794,7 @@ in
 
   fmodex = callPackage ../games/zandronum/fmod.nix { };
 
-  pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; };
+  pdfmod = callPackage ../applications/misc/pdfmod { };
 
   pdf-quench = callPackage ../applications/misc/pdf-quench { };
 
@@ -10311,7 +10311,7 @@ in
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
 
-  hyena = callPackage ../development/libraries/hyena { mono = mono4; };
+  hyena = callPackage ../development/libraries/hyena { };
 
   hyperscan = callPackage ../development/libraries/hyperscan { };