public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mingw-w64-pthreads: Create based on mingw-w64.

Browse Source 
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 <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-02-24 04:44:43 +01:00
parent 4fde72c7d6
commit 44cfba7950
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/windows/mingw-w64/default.nix
View File

@ -1,4 +1,7 @@
{stdenv, fetchurl, binutilsCross ? null, gccCross ? null, onlyHeaders ? false}: { stdenv, fetchurl, binutilsCross ? null, gccCross ? null
, onlyHeaders ? false
, onlyPthreads ? false
}:
let let
name = "mingw-w64-3.1.0"; name = "mingw-w64-3.1.0";
@ -17,6 +20,11 @@ stdenv.mkDerivation (rec {
cd mingw-w64-headers cd mingw-w64-headers
''; '';
configureFlags = "--without-crt --host=x86_64-w64-mingw32"; configureFlags = "--without-crt --host=x86_64-w64-mingw32";
} else if onlyPthreads then {
name = name + "-pthreads";
preConfigure = ''
cd mingw-w64-libraries/winpthreads
'';
} else { } else {
buildInputs = [ gccCross binutilsCross ]; buildInputs = [ gccCross binutilsCross ];

4
pkgs/top-level/all-packages.nix
View File

@ -7191,6 +7191,10 @@ let
onlyHeaders = true; onlyHeaders = true;
}; };
mingw_w64_pthreads = callPackage ../os-specific/windows/mingw-w64 {
onlyPthreads = true;
};
pthreads = callPackage ../os-specific/windows/pthread-w32 { pthreads = callPackage ../os-specific/windows/pthread-w32 {
mingw_headers = mingw_headers3; mingw_headers = mingw_headers3;
}; };