From 013927f93cbca5c823710042e469d573d17859c8 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 23 Dec 2018 17:06:58 +0000
Subject: [PATCH] mono: llvm fork update 3.4svn-mono-f9b1a74368 ->
 3.6-mono-2017-02-15

Also now builds with --enable-llvmloaded.

Extracted by @obadz from @abbradar's #23295
https://github.com/NixOS/nixpkgs/commit/d27768ac1bb06aa4471dc5bcd500a583bd4ece24
---
 .../compilers/mono/build-fix-llvm.patch       | 12 --------
 pkgs/development/compilers/mono/generic.nix   |  1 -
 pkgs/development/compilers/mono/llvm.nix      | 30 ++++++++-----------
 3 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/development/compilers/mono/build-fix-llvm.patch

diff --git a/pkgs/development/compilers/mono/build-fix-llvm.patch b/pkgs/development/compilers/mono/build-fix-llvm.patch
deleted file mode 100644
index 526986ad12c7..000000000000
--- a/pkgs/development/compilers/mono/build-fix-llvm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old b/lib/CodeGen/AsmPrinter/CMakeLists.txt
-index be484a6..c92ff46 100644
---- a/lib/CodeGen/AsmPrinter/CMakeLists.txt.old
-+++ b/lib/CodeGen/AsmPrinter/CMakeLists.txt
-@@ -10,6 +10,7 @@ add_llvm_library(LLVMAsmPrinter
-   DwarfCompileUnit.cpp
-   DwarfDebug.cpp
-   DwarfException.cpp
-+  DwarfMonoException.cpp
-   ErlangGCPrinter.cpp
-   OcamlGCPrinter.cpp
-   Win64Exception.cpp
diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 12f833f55255..400b040ae85b 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
   ]
   ++ stdenv.lib.optionals withLLVM [
     "--enable-llvm"
-    "--enable-llvmloaded"
     "--with-llvm=${llvm}"
   ];
 
diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix
index 8e9dcc1dbcb5..616ec420d2d0 100644
--- a/pkgs/development/compilers/mono/llvm.nix
+++ b/pkgs/development/compilers/mono/llvm.nix
@@ -1,9 +1,10 @@
 { stdenv
-, fetchurl
-, perl
+, lib
+, fetchFromGitHub
 , groff
 , cmake
-, python
+, python2
+, perl
 , libffi
 , libbfd
 , libxml2
@@ -14,22 +15,16 @@
 
 stdenv.mkDerivation rec {
   name    = "llvm-${version}";
-  version = "3.4svn-mono-f9b1a74368";
-  src = fetchurl {
-    # from the HEAD of the 'mono3' branch
-    url = "https://github.com/mono/llvm/archive/f9b1a74368ec299fc04c4cfef4b5aa0992b7b806.tar.gz";
-    name = "${name}.tar.gz";
-    sha256 = "1bbkx4p5zdnk3nbdd5jxvbwqx8cdq8z1n1nhf639i98mggs0zhdg";
+  version = "3.6-mono-2017-02-15";
+
+  src = fetchFromGitHub {
+    owner = "mono";
+    repo = "llvm";
+    rev = "dbb6fdffdeb780d11851a6be77c209bd7ada4bd3";
+    sha256 = "07wd1cs3fdvzb1lv41b655z5zk34f47j8fgd9ljjimi5j9pj71f7";
   };
 
-  patches = [ ./build-fix-llvm.patch ];
-  unpackPhase = ''
-    unpackFile ${src}
-    mv llvm-* llvm
-    sourceRoot=$PWD/llvm
-  '';
-
-  buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isLinux valgrind;
+  buildInputs = [ perl groff cmake libxml2 python2 libffi ] ++ lib.optional stdenv.isLinux valgrind;
 
   propagatedBuildInputs = [ ncurses zlib ];
 
@@ -43,7 +38,6 @@ stdenv.mkDerivation rec {
   cmakeFlags = with stdenv; [
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
-    "-DCMAKE_CXX_FLAGS=-std=c++11"
   ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
 
   enableParallelBuilding = true;