From df1cea1903d04e54c124a0e9bd1546745f0a4a59 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 4 Oct 2011 13:28:32 +0000
Subject: [PATCH 1/2] dotnetfx 4.0 is now the default

svn path=/nixpkgs/trunk/; revision=29628
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afa0dccfe0f..023a05230c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -241,7 +241,7 @@ let
 
   dotnetenv = import ../build-support/dotnetenv {
     inherit stdenv;
-    dotnetfx = dotnetfx35;
+    dotnetfx = dotnetfx40;
   };
 
   vsenv = callPackage ../build-support/vsenv {
@@ -592,6 +592,8 @@ let
 
   dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
 
+  dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
+
   dropbear = callPackage ../tools/networking/dropbear {
     enableStatic = true;
     zlib = zlibStatic;

From 5e34490289a855b42a3e7a7efd8174fe593525c9 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Tue, 4 Oct 2011 13:31:23 +0000
Subject: [PATCH 2/2] Added dotnetfx 4.0

svn path=/nixpkgs/trunk/; revision=29631
---
 .../libraries/dotnetfx40/default.nix          | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/dotnetfx40/default.nix

diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix
new file mode 100644
index 00000000000..b9ce4738d12
--- /dev/null
+++ b/pkgs/development/libraries/dotnetfx40/default.nix
@@ -0,0 +1,23 @@
+{stdenv}:
+
+let
+  windir = "/cygdrive/c/WINDOWS";
+in
+{
+  pkg = stdenv.mkDerivation {
+    name = "dotnetfx-4.0";
+    src = "${windir}/Microsoft.NET/Framework/v4.0.30319";
+    buildCommand = ''
+      ensureDir $out/bin
+      ln -s $src/MSBuild.exe $out/bin
+    '';
+  };
+  
+  assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
+  
+  wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
+  
+  referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
+  
+  referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
+}