Commit Graph

29 Commits

Author SHA1 Message Date
John Ericson
b0ada07f36 wxMSW: Fix syntax --- travis eval did not catch 2017-06-28 22:31:24 -04:00
hsloan
2f37cad1b9 wxMSW-2.8: Don't use stdenv ? cross 2017-06-28 21:29:07 -04:00
hsloan
c4ab3ef580 jom: Don't use stdenc.cross 2017-06-28 21:29:07 -04:00
John Ericson
fc42ec0a5c mingw-w64: Depend on own headers derivation
Without this, a `#include <float.h>` resolves incorrectly. Either the
headers weren't on the include path at all, or they only were for
local, not system, imports.

What's weird is this used to not be a problem. Not sure what other
change in e.g. cc-wrapper would affect this.
2017-06-22 17:53:51 -04:00
John Ericson
bb7067f882 mingw-w64: Clean up, especially clarifying staging 2017-06-22 17:53:51 -04:00
John Ericson
295315cc87 binutilsCross: Remove and use binutils instead always
See previous commit for what was done to `binutils` to make this
possible.

There were some uses of `forcedNativePackages` added. The
combination of overrides with that attribute is highly spooky: it's
often important that if an overridden package comes from it, the
replaced arguments for that package come from it. Long term this
package set and all the spookiness should be gone and irrelevant:

  "Move along, nothing to see here!"

No hashes should be changed with this commit
2017-04-25 21:36:19 -04:00
Vladimír Čunát
13df963c7e mingw: update 3.1.0 -> 4.0.6 2016-04-21 13:38:20 +02:00
Nikolay Amiantov
c48dd664ff jom: move to qmake4Hook 2016-04-20 18:55:55 +03:00
William A. Kennington III
a71f78acf7 libgcrypt: Massive cleanup and make 1.6 the default 2015-05-01 17:41:42 -07:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
aszlig
c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
aszlig
c6cb3276dd
windows/cygwin-setup: Drop meta.platforms attr.
This prevents cross-builds, so let's drop it for now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-04 00:52:39 +01:00
aszlig
1771e07e20
os-specific/windows: Add new package cygwinSetup.
This is primarily going to be used for vmTools.runInWindowsVM, but in
theory, it could also work with Nix on CygWin which I haven't tested.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 23:18:33 +01:00
aszlig
e64b342fa8
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 <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
aszlig
44cfba7950
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 <aszlig@redmoonstudios.org>
2014-02-24 07:26:24 +01:00
aszlig
4fde72c7d6
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 <aszlig@redmoonstudios.org>
2014-02-24 07:26:23 +01:00
aszlig
a78c6490d7
mingw-w64: Update to new upstream version 3.1.0.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:22 +01:00
Ludovic Courtès
ea304762fe pthread-win32: don't propagate `mingw_headers' 2013-03-29 21:46:38 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Lluís Batlle i Rossell
0332f87a0b Adding windows jom; it does not build for me still, but it's close to it.
I think it's better to share it though. I wrote a comment about the expression
not building.


svn path=/nixpkgs/trunk/; revision=34365
2012-06-05 21:24:27 +00:00
Lluís Batlle i Rossell
383b76df79 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
2012-05-24 22:07:23 +00:00
Lluís Batlle i Rossell
3729f9ce5e Trying to add a few bits of mingw-w64. To be tested.
svn path=/nixpkgs/trunk/; revision=34228
2012-05-24 21:23:23 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Ludovic Courtès
010edf825c Add pthreads-w32.
svn path=/nixpkgs/trunk/; revision=31927
2012-01-30 09:53:45 +00:00
Ludovic Courtès
67a45c1d25 MinGW 3.20, and w32api 3.17-2.
svn path=/nixpkgs/trunk/; revision=31926
2012-01-30 09:53:39 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Lluís Batlle i Rossell
2c8783a48b Making wxGTK stay wxGTK even cross-built, so I remove the wxMSW code I added
to test the crossbuilding with wxGTK.
I added a new windows-specific package: wxMSW.

svn path=/nixpkgs/trunk/; revision=21634
2010-05-06 19:19:22 +00:00
Lluís Batlle i Rossell
c548c084bb Making gcc-4.5 cross-build to mingw32 too (set by the proper config and libc = "msvcrt"
in the crossSystem)

svn path=/nixpkgs/trunk/; revision=21630
2010-05-06 18:22:51 +00:00