From a78c6490d70d7b7ebb0b2ba593dcbba2af7ab631 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 23 Feb 2014 23:44:11 +0100 Subject: mingw-w64: Update to new upstream version 3.1.0. Signed-off-by: aszlig --- pkgs/os-specific/windows/mingw-w64/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'pkgs/os-specific/windows') diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index c358565c4551..0d7beb532fe7 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,23 +1,15 @@ {stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: let - name = "mingw-w64-2.0.3"; + name = "mingw-w64-3.1.0"; in stdenv.mkDerivation (rec { inherit name; src = fetchurl { - url = "mirror://sourceforge/mingw-w64/mingw-w64-v2.0.3.tar.gz"; - sha256 = "043jk6z90f9pxs9kfn6ckh2vlnbgcv6yfbp5ybahrj3z58dcijp5"; + url = "mirror://sourceforge/mingw-w64/mingw-w64-v3.1.0.tar.bz2"; + sha256 = "1lhpw381gc59w8b1r9zzdwa9cdi2wx6qx7s6rvajapmbw7ksgrzc"; }; - - # 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"; -- cgit v1.2.3 From 4fde72c7d64c78de2e41ba91153cebb907e63100 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Feb 2014 04:43:00 +0100 Subject: mingw-w64: Fix typo in preConfigure hook. D'oh, no wonder the headers are of almost the same size as the main package. Signed-off-by: aszlig --- pkgs/os-specific/windows/mingw-w64/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific/windows') diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 0d7beb532fe7..f1c509a50984 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { } // (if onlyHeaders then { name = name + "-headers"; - preConfingure = '' + preConfigure = '' cd mingw-w64-headers ''; configureFlags = "--without-crt --host=x86_64-w64-mingw32"; -- cgit v1.2.3 From 44cfba79509f6dd98ae306f62f2cc3183bbd1ab1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Feb 2014 04:44:43 +0100 Subject: mingw-w64-pthreads: Create based on mingw-w64. The winpthreads library is part of the same source package, so let's just override the name and the source directory. Signed-off-by: aszlig --- pkgs/os-specific/windows/mingw-w64/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific/windows') diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index f1c509a50984..c5b6017aae4d 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -1,4 +1,7 @@ -{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: +{ stdenv, fetchurl, binutilsCross ? null, gccCross ? null +, onlyHeaders ? false +, onlyPthreads ? false +}: let name = "mingw-w64-3.1.0"; @@ -17,6 +20,11 @@ stdenv.mkDerivation (rec { cd mingw-w64-headers ''; configureFlags = "--without-crt --host=x86_64-w64-mingw32"; +} else if onlyPthreads then { + name = name + "-pthreads"; + preConfigure = '' + cd mingw-w64-libraries/winpthreads + ''; } else { buildInputs = [ gccCross binutilsCross ]; -- cgit v1.2.3 From e64b342fa8fda783a7247e0469943ce728498004 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Mar 2014 22:31:18 +0100 Subject: Use mingw-w64 for 32bit Windows builds as well. Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And because our Windows cross builds were also poorly maintained and most of the cross-tests were broken as well, I'm just taking this step and try to switch to mingw-w64 for everything "cross Windows". Signed-off-by: aszlig --- pkgs/os-specific/windows/mingw-w64/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific/windows') diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index c5b6017aae4d..bf15b208e1a7 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { preConfigure = '' cd mingw-w64-headers ''; - configureFlags = "--without-crt --host=x86_64-w64-mingw32"; + configureFlags = "--without-crt"; } else if onlyPthreads then { name = name + "-pthreads"; preConfigure = '' -- cgit v1.2.3