3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

69 commits

Author SHA1 Message Date
Silvan Mosberger 57bccb3cb8 treewide: http -> https sources ()
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Orivej Desh 96606abf82 SDL: propagate libiconv
SDL/SDL.h includes SDL/SDL_stdinc.h which includes iconv.h, therefore all
packages that include SDL.h should be able to include iconv.h

Fixes SDL_gfx, SDL_image etc. on Darwin.
2018-06-03 20:00:40 +00:00
John Ericson 219b74d71b SDL, SDL2: Remove crossAttrs
Cross drvs are now the default for precisely this reason.
2018-05-10 13:14:12 -04:00
Vladimír Čunát 488ef9a7a0
SDL: avoid cryptic error from /bin/sh impurity 2018-03-18 10:17:57 +01:00
Jan Malakhovski 2e3077c907 SDL: propagate X11 libs even when building statically against them on Darwin
Packages like SDL_image, SDL_mixer, SDL_net, SDL_ttf depend on this.

This reverts a piece of 19130ebc5d.
2018-03-08 11:21:04 +00:00
Jan Malakhovski 19130ebc5d SDL: build statically against x11 on Darwin 2018-03-06 15:57:27 +00:00
Jan Malakhovski f114118842 SDL, SDL2: don't link statically to any of the inputs 2018-03-06 15:43:27 +00:00
Jan Malakhovski 6166027ca8 SDL, SDL2: cleanup and cross-pollinate with useful changes to either expression 2018-03-06 15:42:26 +00:00
Jan Malakhovski d3c3364bfa SDL: add a patch to fix https://bugzilla.libsdl.org/show_bug.cgi?id=1769 2018-03-06 15:24:56 +00:00
Alexander V. Nikolaev 1bc1909e5b treewide: transition from mesa_glu to libGLU 2018-02-24 17:05:43 +02:00
Alexander V. Nikolaev 8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Will Dietz 2e2517c9c9 SDL: add libiconv to fix build 2018-02-13 09:44:54 -06:00
Dan Peebles dfd300c81d treewide: s/pkgs.fedoraproject.org/src.fedoraproject.org/
Upstream killed the pkgs server but src continues to serve up the exact
same content, so we can just point there and all hashes should be unchanged.
2018-02-08 16:38:08 -05:00
John Ericson 046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
hsloan 784ffeaabd SDL: Don't use stdenv ? cross
Simplify and finess logic a bit in a way that doesn't affect the
default native build, too.
2017-06-28 19:25:41 -04:00
John Ericson 80a857f8d7 SDL: Don't use stdenv.cross 2017-06-28 18:21:06 -04:00
Peter Hoeg c5fcd96970 sdl: fix very long filename 2017-02-11 12:26:17 +08:00
Nikolay Amiantov fc0b40328d SDL: fix OpenGL support 2016-09-03 15:37:06 +03:00
Robert Helgesson 38bd2c4425 SDL: fix startup of (some) games using OpenGL
Fixes .
2016-09-03 12:46:39 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Nikolay Amiantov b47327ebd5 SDL: cleanup and add patch to discover extensions 2016-08-22 06:30:00 +03:00
Ricardo Ardissone 79914075f4 SDL: Revert "SDL: use mesa_noglu instead of mesa"
This reverts commit a9a94df4e6.
2016-05-12 18:40:33 -03:00
Nikolay Amiantov a9a94df4e6 SDL: use mesa_noglu instead of mesa 2016-04-24 16:21:28 +03:00
Vladimír Čunát 09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Vladimír Čunát a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Nikolay Amiantov 234f461139 SDL: add patches from Fedora
Fixes several bugs (some of which were fixed in the official repository but no
release made).
2016-02-07 05:05:19 +03:00
Vincent Laporte ca535e4c1f SDL: propagate Cocoa dependency on darwin 2016-02-05 18:53:26 +01:00
Luca Bruno e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Henry Till a7784cafa3 SDL: fix on darwin 2015-10-28 19:44:30 -04:00
Vladimír Čunát 787f322540 $docdev fixups: mostly to avoid empty output
... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
2015-10-28 18:58:06 +01:00
Vladimír Čunát 9da12a6713 SDL: split the dev output and fix referrers 2015-10-13 20:18:56 +02:00
Vladimír Čunát 1fdbc3097b alsa-lib: split "dev" output and fix referrers 2015-10-13 20:18:55 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Eelco Dolstra e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Vladimír Čunát 043a8478c3 SDL: propagate libcap and fixup native inputs
Close .
All inputs except pkgconfig shouldn't be native but rather disabled on
cygwin, I suppose.
2015-06-08 11:16:33 +02:00
William A. Kennington III b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
Spencer Whitt b37d5864d6 SDL: libcap is Linux only 2015-04-29 17:39:42 -04:00
Michael Raskin c9c2aa5ced Pass libcap as SDL input to fix the build 2015-04-26 18:06:15 +03:00
Spencer Whitt 1cef6dc89a SDL: Build on Darwin 2015-03-26 11:14:45 -04:00
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 .

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 ) 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