Commit Graph

28 Commits

Author SHA1 Message Date
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
aszlig
28229d8ef1
SDL: Add alsaLib to propagatedNativeBuildInputs.
This is needed because the pkgconfig file contains linker flags for
alsa-lib. And we had it propagated before already.

Should fix build of quite a lot of SDL dependencies, such as SDL_image:

https://hydra.nixos.org/build/10558332

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-04-22 05:54:39 +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
6998a866a8
SDL: Refactor package and fix Darwin cross-builds.
First of all, this needs two upstream patches for supporting OS X 10.9,
also the cross-gcc doesn't accept -fpascal-strings, so drop the flag.

And except putting all configure flags into a multiline string, we're
now using a list, which is easier when it comes to handling optional
components.

As X isn't used on recent Mac OS X versions and Windows, I'm temporarily
using --without-x for cross-builds until we have a better way to check
for those things.

Also, don't add audiofile to buildInputs if we're cross-compiling for
MinGW.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:48 +01:00
aszlig
a3cf381435
SDL/cross: Drop --disable-directx.
This is no longer needed, because we've already fixed the dynamic
cross-linker.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:49 +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
fbc307a183
SDL/cross: Fix building with mingw-w64.
This is to make sure that we don't get Xlibs or alsa in cross builds,
because those aren't available on non-Linux/Unix platforms.

Also, until we don't have the DirectX SDK packaged, let's disable it
during cross builds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:25 +01:00
Jason \"Don\" O'Conal
834cd6c886 beret: Fix build on darwin (close #923) 2013-09-08 10:32:25 +02:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Vladimír Čunát
aa0fb73064 mesa: make the attribute include the GL/glu.h
Packages expect it and it used to be true until mesa-9*.
This seems to be the easiest fix, otherwise many changes would be needed.
2013-01-31 22:44:31 +01:00
Vladimír Čunát
f02e061313 SDL: minor update, fix OpenGL support, change some flags from Gentoo 2013-01-30 16:44:55 +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
51f6aec764 Fixing the gcc-cross-wrapper; it failed after some changes related to breaking
dependencies with it. (I should never link ld.so with a NIX_LDFLAGS -rpath
forced)

I made vim, scummvm cross-build. I added prboom (that cross-builds).
Mplayer and elinks don't cross-build fine still, but are on the way.
The mplayer fails to build in a weird way; nix does not show either a gcc
error message or even the 'make' error message.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23131
2010-08-11 20:14:25 +00:00
Ludovic Courtès
c26eacc555 SDL 1.2.14.
svn path=/nixpkgs/trunk/; revision=17911
2009-10-21 13:21:22 +00:00
Ludovic Courtès
44856bc4d0 SDL: Disable OSS support.
svn path=/nixpkgs/trunk/; revision=17910
2009-10-21 13:21:18 +00:00
Ludovic Courtès
a80578b312 Propagate GDBM from PulseAudio to make hints from `.la' files work.
svn path=/nixpkgs/trunk/; revision=15556
2009-05-11 21:11:25 +00:00
Ludovic Courtès
777f805eba SDL: Add PulseAudio support.
svn path=/nixpkgs/trunk/; revision=15555
2009-05-11 19:57:42 +00:00
Eelco Dolstra
80b2254cbb * SDL 1.2.13.
svn path=/nixpkgs/trunk/; revision=12092
2008-06-14 20:46:34 +00:00
Eelco Dolstra
a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra
1dedc5ef87 * Added Exult.
svn path=/nixpkgs/trunk/; revision=6501
2006-09-12 00:15:05 +00:00
Eelco Dolstra
083699314d * Latest ALSA, SDL.
svn path=/nixpkgs/trunk/; revision=6500
2006-09-11 23:06:26 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra
8544fe567a * Added the OpenAL sound library.
* Enabled (optional) 3D support in SDL.

svn path=/nixpkgs/trunk/; revision=4594
2006-01-26 14:01:08 +00:00
Eelco Dolstra
b6befed50e * Updated SDL, NASM and Generator to the latest versions.
* Moved Generator to the misc/emulators directory.

svn path=/nixpkgs/trunk/; revision=4330
2005-12-03 01:33:18 +00:00
Eelco Dolstra
0fc44c5e5e * SDL updated to 1.2.8.
svn path=/nixpkgs/trunk/; revision=3315
2005-07-12 11:28:43 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
dc29a4ac48 * Added SDL, Simple DirectMedia Layer.
* Added NASM, the Netwide Assembler.
* Added Generator, an emulator for Sega Genesis / Mega Drive machines.
  Built with XVideo patch. Strangely it crashes with a GDK error when
  started in normal mode.  However, with the "-a" switch (arcade mode)
  it works, and subsequently switching back to windowed mode (Ctrl-F)
  also works.

svn path=/nixpkgs/trunk/; revision=1509
2004-09-26 18:12:51 +00:00