windows: Cleanups

6 files changed, 28 insertions, 41 deletions

diff --git a/pkgs/os-specific/windows/mingw-headers/default.nix b/pkgs/os-specific/windows/mingw-headers/default.nix
deleted file mode 100644
index c6941ef01f0a..000000000000
--- a/pkgs/os-specific/windows/mingw-headers/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, mingw_runtime_headers, w32api_headers}:
-
-stdenv.mkDerivation {
-  name = "mingw-headers";
-
-  phases = [ "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out/include
-    cp -R ${mingw_runtime_headers}/include/* $out/include
-    cp -R ${w32api_headers}/include/* $out/include
-  '';
-}
diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix
deleted file mode 100644
index 6a28b9e7abd2..000000000000
--- a/pkgs/os-specific/windows/mingw-w64/common.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ fetchurl }:
-
-rec {
-  version = "5.0.4";
-  name = "mingw-w64-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
-    sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm";
-  };
-}
diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index dd151f696c82..a7d4f09b90e9 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -1,7 +1,20 @@
-{ stdenv, callPackage, windows }:
+{ stdenv, windows, fetchurl }:
+
+let
+  version = "5.0.4";
+in stdenv.mkDerivation {
+  name = "mingw-w64-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
+    sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm";
+  };
+
+  configureFlags = [
+    "--enable-idl"
+    "--enable-secure-api"
+  ];
 
-stdenv.mkDerivation {
-  inherit (callPackage ./common.nix {}) name src;
   buildInputs = [ windows.mingw_w64_headers ];
   dontStrip = true;
   hardeningDisable = [ "stackprotector" "fortify" ];
diff --git a/pkgs/os-specific/windows/mingw-w64/headers.nix b/pkgs/os-specific/windows/mingw-w64/headers.nix
index 91ae35583576..6a93cea67080 100644
--- a/pkgs/os-specific/windows/mingw-w64/headers.nix
+++ b/pkgs/os-specific/windows/mingw-w64/headers.nix
@@ -1,15 +1,13 @@
-{ stdenvNoCC, callPackage }:
+{ stdenvNoCC, mingw_w64 }:
 
-let
-  inherit (callPackage ./common.nix {}) name src;
-
-in stdenvNoCC.mkDerivation {
-  name = name + "-headers";
-  inherit src;
+stdenvNoCC.mkDerivation {
+  name = "${mingw_w64.name}-headers";
+  inherit (mingw_w64) src meta;
 
   patches = [ ./osvi.patch ];
 
   preConfigure = ''
     cd mingw-w64-headers
   '';
+
 }
diff --git a/pkgs/os-specific/windows/mingw-w64/osvi.patch b/pkgs/os-specific/windows/mingw-w64/osvi.patch
index 8d82f56d86fe..c51ff4bd5dfd 100644
--- a/pkgs/os-specific/windows/mingw-w64/osvi.patch
+++ b/pkgs/os-specific/windows/mingw-w64/osvi.patch
@@ -1,3 +1,6 @@
+Fix `error:  osvi  undeclared (first use in this function)' issue.
+
+See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863064
 --- a/mingw-w64-headers/include/multimon.h
 +++ b/mingw-w64-headers/include/multimon.h
 @@ -127,7 +127,7 @@
diff --git a/pkgs/os-specific/windows/mingw-w64/pthreads.nix b/pkgs/os-specific/windows/mingw-w64/pthreads.nix
index 1a33e8db07e8..bbcb028d3cbb 100644
--- a/pkgs/os-specific/windows/mingw-w64/pthreads.nix
+++ b/pkgs/os-specific/windows/mingw-w64/pthreads.nix
@@ -1,11 +1,8 @@
-{ stdenv, callPackage }:
+{ stdenv, mingw_w64 }:
 
-let
-  inherit (callPackage ./common.nix {}) name src;
-
-in stdenv.mkDerivation {
-  name = name + "-pthreads";
-  inherit src;
+stdenv.mkDerivation {
+  name = "${mingw_w64.name}-pthreads";
+  inherit (mingw_w64) src meta;
 
   preConfigure = ''
     cd mingw-w64-libraries/winpthreads