mingw-w64: Clean up, especially clarifying staging

This commit is contained in:
John Ericson
2017-06-22 17:53:51 -04:00
committed by John Ericson
parent c2e2152afc
commit bb7067f882
5 changed files with 55 additions and 51 deletions
@@ -0,0 +1,11 @@
{ fetchurl }:
rec {
version = "4.0.6";
name = "mingw-w64-${version}";
src = fetchurl {
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
};
}
+4 -34
View File
@@ -1,36 +1,6 @@
{ stdenv, fetchurl, binutils ? null, gccCross ? null
, onlyHeaders ? false
, onlyPthreads ? false
}:
let
version = "4.0.6";
name = "mingw-w64-${version}";
in
stdenv.mkDerivation ({
inherit name;
src = fetchurl {
url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
};
} //
(if onlyHeaders then {
name = name + "-headers";
preConfigure = ''
cd mingw-w64-headers
'';
configureFlags = "--without-crt";
} else if onlyPthreads then {
name = name + "-pthreads";
preConfigure = ''
cd mingw-w64-libraries/winpthreads
'';
} else {
buildInputs = [ gccCross binutils ];
crossConfig = gccCross.crossConfig;
{ stdenv, callPackage }:
stdenv.mkDerivation {
inherit (callPackage ./common.nix {}) name src;
dontStrip = true;
})
)
}
@@ -0,0 +1,13 @@
{ stdenvNoCC, callPackage }:
let
inherit (callPackage ./common.nix {}) name src;
in stdenvNoCC.mkDerivation {
name = name + "-headers";
inherit src;
preConfigure = ''
cd mingw-w64-headers
'';
}
@@ -0,0 +1,13 @@
{ stdenvNoCC, callPackage }:
let
inherit (callPackage ./common.nix {}) name src;
in stdenvNoCC.mkDerivation {
name = name + "-pthreads";
inherit src;
preConfigure = ''
cd mingw-w64-libraries/winpthreads
'';
}