Fixing mingw-w64 builds. I can build simple C++ programs with gccCrossStageFinal.

I also add tests for hydra; let's see if it builds far.


svn path=/nixpkgs/trunk/; revision=34232

1 files changed, 7 insertions, 7 deletions

diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index 570b40bdac69..c358565c4551 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -11,6 +11,13 @@ stdenv.mkDerivation (rec {
     sha256 = "043jk6z90f9pxs9kfn6ckh2vlnbgcv6yfbp5ybahrj3z58dcijp5";
   };
 
+  # I don't know what's that $host directory about, I put the
+  # files inside include as usual.
+  postInstall = ''
+    rmdir $out/include
+    mv $out/x86_64-w64-mingw32/* $out
+    rm -R $out/x86_64-w64-mingw32
+  '';
 } //
 (if onlyHeaders then {
   name = name + "-headers";
@@ -18,13 +25,6 @@ stdenv.mkDerivation (rec {
     cd mingw-w64-headers
   '';
   configureFlags = "--without-crt --host=x86_64-w64-mingw32";
-
-  # I don't know what's that $host directory about, I put the
-  # files inside include as usual.
-  postInstall = ''
-    mv $out/x86_64-w64-mingw32/include/* $out/include
-    rm -R $out/x86_64-w64-mingw32
-  '';
 } else {
   buildInputs = [ gccCross binutilsCross ];