Merge pull request #5041 from vbgl/mono

Updates mono, fsharp and monodevelop

Closes #4782.

5 files changed, 40 insertions, 126 deletions

diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh
deleted file mode 100644
index c069edb3a6d4..000000000000
--- a/pkgs/applications/editors/monodevelop/builder.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-export MONO_GAC_PREFIX=$monodoc:$gtksharp
-
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    moz=$(ls $mozilla/lib/*/libgtkembedmoz.so)
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix LD_LIBRARY_PATH ':' "$gtksharp/lib" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
-            --suffix MONO_GAC_PREFIX ':' "$gtkmozembedsharp" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksourceviewsharp" \
-            --suffix MONO_GAC_PREFIX ':' "$monodoc" \
-            --set MOZILLA_FIVE_HOME "$(dirname $moz)"
-    done
-}
-
-genericBuild
-
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index aad6325fa44d..737576a1da0d 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -1,26 +1,47 @@
-{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
-, gtkmozembedsharp, monodoc
-, perl, perlXMLParser, pkgconfig
-, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
-, mozilla, makeWrapper
+{stdenv, fetchgit
+, autoconf, automake, pkgconfig, shared_mime_info, intltool
+, glib, mono, gtk-sharp, gnome-sharp
 }:
 
-stdenv.mkDerivation {
-  name = "monodevelop-0.6-pre2315";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://tarballs.nixos.org/monodevelop-0.6-pre2315.tar.bz2;
-    md5 = "8c33df5629b0676b7ab552854c1de6fd";
+stdenv.mkDerivation rec {
+  version = "5.1.4.0";
+  revision = "7d45bbe2ee22625f125d0c52548524f02d005cca";
+  name = "monodevelop-${version}";
+  src = fetchgit {
+    url = https://github.com/mono/monodevelop.git;
+    rev = revision;
+    sha256 = "0qy12zdvb0jiic3pq1w9mcsz2wwxrn0m92abd184q06yg5m48g1b";
   };
 
-  patches = [./prefix.patch];
-  
   buildInputs = [
-    file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
-    glib gtk GConf gnome_vfs libbonobo libglade libgnome
-    gtkmozembedsharp monodoc
+    autoconf automake pkgconfig shared_mime_info intltool
+    mono gtk-sharp gnome-sharp
   ];
-  
-  inherit mozilla monodoc gtksharp gtkmozembedsharp gtksourceviewsharp makeWrapper;
+
+  preConfigure = "patchShebangs ./configure";
+  preBuild = ''
+    cat > ./main/buildinfo <<EOF
+    Release ID: ${version}
+    Git revision: ${revision}
+    Build date: 1970-01-01 00:00:01
+    EOF
+  '';
+
+  postInstall = ''
+    for prog in monodevelop mdtool; do
+    patch -p 0 $out/bin/$prog <<EOF
+    2a3,5
+    > export MONO_GAC_PREFIX=${gtk-sharp}:\$MONO_GAC_PREFIX
+    > export PATH=${mono}/bin:\$PATH
+    > export LD_LIBRARY_PATH=${glib}/lib:${gnome-sharp}/lib:${gtk-sharp}/lib:${gtk-sharp.gtk}/lib:\$LD_LIBRARY_PATH
+    > 
+    EOF
+    done
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/applications/editors/monodevelop/prefix.patch b/pkgs/applications/editors/monodevelop/prefix.patch
deleted file mode 100644
index 5ab0b4042dd4..000000000000
--- a/pkgs/applications/editors/monodevelop/prefix.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -rc MonoDevelop-orig/Makefile.in MonoDevelop/Makefile.in
-*** MonoDevelop-orig/Makefile.in	2005-03-09 17:43:58.000000000 +0100
---- MonoDevelop/Makefile.in	2005-03-09 18:10:20.000000000 +0100
-***************
-*** 298,304 ****
-  # (mkdir ../../build/bin/ hack)
-  SUBDIRS = Core build po Extras
-  bin_SCRIPTS = monodevelop
-! gnome_data = @gnome_prefix@/share
-  desktopdir = $(gnome_data)/applications
-  desktop_DATA = monodevelop.desktop
-  pixmapdir = $(gnome_data)/pixmaps
---- 298,304 ----
-  # (mkdir ../../build/bin/ hack)
-  SUBDIRS = Core build po Extras
-  bin_SCRIPTS = monodevelop
-! gnome_data = @prefix@/share
-  desktopdir = $(gnome_data)/applications
-  desktop_DATA = monodevelop.desktop
-  pixmapdir = $(gnome_data)/pixmaps
-***************
-*** 809,818 ****
-  all:
-  
-  install-data-hook:
-! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  uninstall-hook:
-! 	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  run: runmd
-  
---- 809,818 ----
-  all:
-  
-  install-data-hook:
-! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  uninstall-hook:
-! #	$(UPDATE_MIME_DB) $(gnome_data)/mime
-  
-  run: runmd
-  
-Only in MonoDevelop: Makefile.in~
diff --git a/pkgs/applications/editors/monodoc/builder.sh b/pkgs/applications/editors/monodoc/builder.sh
deleted file mode 100644
index bcea7a7a89af..000000000000
--- a/pkgs/applications/editors/monodoc/builder.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-source $stdenv/setup
-source $makeWrapper
-
-postInstall() {
-    mv $out/bin $out/bin-orig
-    mkdir $out/bin
-
-    for i in $out/bin-orig/*; do
-        echo "wrapping $(basename $i)"
-        # !!! TODO: figure out the MONO_GAC_PREFIX automatically
-        makeWrapper "$i" "$out/bin/$(basename $i)" \
-            --suffix PATH ':' "$(dirname $(type -p mono))" \
-            --suffix MONO_GAC_PREFIX ':' "$gtksharp" \
-            --suffix MONO_GAC_PREFIX ':' "$out"
-    done
-}
-
-genericBuild
-
-
diff --git a/pkgs/applications/editors/monodoc/default.nix b/pkgs/applications/editors/monodoc/default.nix
deleted file mode 100644
index 0e8421646a86..000000000000
--- a/pkgs/applications/editors/monodoc/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, mono, gtksharp, pkgconfig, makeWrapper}:
-
-stdenv.mkDerivation {
-  name = "monodoc-1.0.6";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://tarballs.nixos.org/monodoc-1.0.6.tar.gz;
-    md5 = "f2fc27e8e4717d90dc7efa2450625693";
-  };
-
-  buildInputs = [mono gtksharp pkgconfig];
-
-  inherit gtksharp makeWrapper;
-}