Commit Graph

16 Commits

Author SHA1 Message Date
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
3d73bf6c57
glew/cross: Fix build for Darwin.
The Makefile still contained calls to install with the -s (strip)
option, which we don't want because it uses the native strip utility and
we're going to crossStrip in fixupPhase later anyway.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:46 +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
b9bc42d0f3
glew/cross: Fix building with mingw-w64.
This also cleans up the package expression a bit and we no longer
directly override the phases (except patchPhase).

Also for cross-builds we're using the stock mingw target and pass CC, LD
and STRIP to make, because the mingw-w64 targets of the upstream package
are outdated.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:24 +01:00
Nixpkgs Monitor
efa05777b0 glew: update from 1.9.0 to 1.10.0 2013-12-18 18:18:29 +02:00
Evgeny Egorochkin
0d76e1cb94 glew: install glewinfo and visualinfo 2013-10-24 13:01:53 +03:00
Vladimír Čunát
de5b992ecf qt, glew: propagate glu
After removing qt's dependency on the symlinked combination of mesa and glu,
many qt apps were missing it now (since e9f0d10).
I resove this to a compromise.
2013-08-06 10:37:15 +02:00
Song Wenwu
e094ccc10c glew: install libraries to $out/lib instead of $out/lib64 2013-06-09 08:33:34 +08:00
Vladimír Čunát
7959eaf8dd glew: update
Most code taken from the huge pull request
f28674a68b
and added another update, changed description.
2013-05-18 13:24:30 +02:00
Michael Raskin
9f2be8d6b1 Update GLEW
svn path=/nixpkgs/trunk/; revision=31867
2012-01-26 18:04:02 +00:00
Eelco Dolstra
749b8607ca * More cleanup.
svn path=/nixpkgs/trunk/; revision=22795
2010-07-28 15:35:01 +00:00
Eelco Dolstra
aee659e1e2 * Fix various broken URLs / mirrors.
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
2010-02-05 22:00:51 +00:00
Lluís Batlle i Rossell
218c918909 Updating glew
svn path=/nixpkgs/trunk/; revision=19596
2010-01-21 14:39:57 +00:00
Yury G. Kudryashov
5bca69ac34 Nix-expr style review
Unneded args.something replaced with
args: with args;
line. After this line args is the only place where we can recieve variables from.

Also removed several
buildInputs = [];
lines.

svn path=/nixpkgs/trunk/; revision=10415
2008-01-30 17:20:48 +00:00
Marc Weber
817d45cb23 fix (now installs into ;)
svn path=/nixpkgs/trunk/; revision=10183
2008-01-17 00:34:19 +00:00
Marc Weber
dc2769ded8 glew added
svn path=/nixpkgs/trunk/; revision=10164
2008-01-16 02:20:46 +00:00