Commit Graph

66 Commits

Author SHA1 Message Date
Jan Tojnar
fc7bd322df
Merge branch 'staging-next' into staging 2021-01-19 13:50:04 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Carles Pagès
d07276113a SDL2: 2.0.12 -> 2.0.14 2021-01-17 00:06:38 +01:00
Carles Pagès
ba5b8aa859 SDL2: fix cmake interface includes for SDL2::SDL2
Fixes #103346. The environment var for finding the cmake companion libs
headers was missing from the SDL2::SDL2 target, it only worked when
using SDL2_INCLUDE_DIRS.
2020-11-11 12:53:49 +01:00
Mario Rodas
49897b8859
SDL2: fix build on darwin 2020-07-13 04:20:00 -05:00
Matthew Bauer
1a835f911b SDL2: get native wayland-scanner 2020-06-25 00:09:22 -04:00
Karol Chmist
4babef9608 SDL2: Add dontDisableStatic = withStatic ? false 2020-05-21 11:35:19 +02:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Carles Pagès
00ba289dab SDL2: 2.0.10 -> 2.0.12 2020-03-12 00:19:08 +01:00
Carles Pagès
539e94030c
Merge pull request #72736 from nh2/nix-sdl2-static-fixes
SDL2: Keep .a files on `dontDisableStatic`; don't move them to $dev; prune .la
2019-11-10 22:18:38 +01:00
Niklas Hambüchen
57908c1624 SDL2: Keep .a files on dontDisableStatic; don't move them to $dev; prune .la.
Most other packages don't move `.a` files to "$dev", and that is because
it makes the pkg-config `.pc` file wrong (the `libdir` is the non-dev one).

Keeping them in the main output makes static linking of SDL2 work.

See added comment about pruning of `.la` files.
2019-11-08 23:12:59 +01:00
John Ericson
12a85a7046 SDL, SDL2: SDL{,2}_PATH may be undefined 2019-11-08 13:28:58 -05:00
Tad Fisher
c0c69261df
SDL2: patch build with mesa 19.2 2019-10-09 20:41:59 +02:00
Pierre Bourdon
1a1696f9b6 SDL2: don't mix space-separated / lists in cmake config
The SDL2_PATH environment variable is space-separated. However, CMake
lists are semicolon separated, and doing set(list "a" ${var}) will end
up with list containing "a;b c d". This causes downstream users to fail
parsing the include dirs list.

Normalize the include dirs list to a normal CMake semicolon-separated
list using separate_arguments.
2019-08-22 11:41:16 +03:00
Carles Pagès
ebe711a12f SDL2: 2.0.9 -> 2.0.10 2019-08-18 18:13:29 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Daiderd Jordan
ee85cef108
SDL: remove cf-private 2019-07-03 22:20:17 +02:00
Matthew Bauer
f0733a07d5 treewide: remove libGLSupported from pkgs
This isn’t a package, and we already have mesaPlatforms to handle this logic.
2019-06-17 11:49:22 -04:00
Mitsuhiro Nakamura
e034a519a4 SDL2: add fcitx support (#60991) 2019-05-05 23:51:08 -04:00
Matthew Bauer
d665b8ccf3 SDL{,2}: support building for android
This should be picking up the OpenGL ES headers provided by the NDK.
More testing is needed.
2019-02-24 17:00:48 -05:00
Orivej Desh (NixOS)
9a21967f0a
stdenv: prune libtool files by default (#51767)
See the motivation in fd97db43bc (#41819).
2019-01-11 13:20:46 +00:00
Lengyel Balazs
f4a53ff3bc treewide/xorg: replace *proto with xorgproto 2019-01-04 14:38:57 +01:00
Piotr Bogdan
d121dd5222 treewide: remove references to pruneLibtoolFiles, now included by default 2018-12-09 23:28:46 +00:00
gnidorah
40f8dceff5 SDL2: enable parallel building 2018-11-13 19:41:39 +03:00
Daiderd Jordan
b6dcb9e641
Merge pull request #49768 from LnL7/darwin-no-cfprivate
darwin: don't include cf-private in framework dependencies
2018-11-06 20:15:27 +01:00
Carles Pagès
d9f8cf734e SDL2: 2.0.8 -> 2.0.9 2018-11-05 22:25:55 +01:00
Daiderd Jordan
8abc1cccfb
SDL: move overrides out of all-packages.nix
Using defaults makes it much easier to understand what the values are.
2018-11-05 14:10:44 +01:00
Daiderd Jordan
fd1ffd0e0d
SDL2: include cf-private on darwin
It's not included implicitly by the frameworks anymore.

    Undefined symbols for architecture x86_64:
      "_NSDefaultRunLoopMode", referenced from:
          _Cocoa_PumpEvents in SDL_cocoaevents.o
      "_NSURLIsAliasFileKey", referenced from:
          -[SDLWindow performDragOperation:] in SDL_cocoawindow.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in SDL_cocoaclipboard.o
          objc-class-ref in SDL_cocoakeyboard.o
          objc-class-ref in SDL_cocoawindow.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in SDL_cocoamouse.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in SDL_cocoaevents.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in SDL_cocoaevents.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in SDL_cocoawindow.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in SDL_cocoawindow.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in SDL_cocoaevents.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table67 in SDL_cocoawindow.o
    ld: symbol(s) not found for architecture x86_64
2018-11-05 12:46:01 +01:00
Orivej Desh
ccfc0d599d SDL2: do not propagate private dependencies
Fixes #41620 by adding libGL directory to libSDL2 runpath
2018-07-02 21:34:33 +00:00
Orivej Desh
3db4ce91d0 SDL2: do not patchelf libSDL2.so twice
There are two symlinks pointing to the same library, libSDL2.so and
libSDL2-2.0.so.0.  patchelf should run on non-symlinks instead.
2018-07-02 21:34:33 +00:00
Orivej Desh
8d5570a041 SDL2: limit postFixup to the platforms supported by patchelf
This prevents future rebuilds on Darwin if this Linux-only postFixup changes.
2018-07-02 21:34:33 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* 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
Matthew Bauer
08c6c6beb4 SDL2: disable sdltest on darwin
Darwin headless will hang when trying to run the SDL test program.
2018-06-06 19:19:30 -04: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
Michael Raskin
b49ef26eca
Merge pull request #36377 from oxij/pkgs/fix-pulseaudio-references
tree-wide: fix pulseaudio references; fix SDL expressions
2018-03-06 19:56:36 +00:00
Carles Pagès
344bc9cde6 SDL2: 2.0.7 -> 2.0.8 2018-03-06 20:31:59 +01:00
Jan Malakhovski
39319f3a75 SDL2: don't compile any static outputs
After the previous patch there's no reason to have them. But I didn't try to
rebuild every single thing that depends on this, so try reverting this patch first
if something does break and you can't fix it.
2018-03-06 15:43:29 +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
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
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
Vladimír Čunát
020a6663d3 SDL2: disable parallel building
Example failure: https://hydra.nixos.org/build/63996552

(cherry picked from commit 80e8e555b4)
2017-11-17 03:43:46 +00:00
gnidorah
b0d193f596 SDL2: wayland support 2017-11-06 16:09:03 +02:00
Franz Pletz
4c26199ad7
SDL2: 2.0.5 -> 2.0.7 for CVE-2017-2888 2017-10-27 11:58:50 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Lluís Batlle i Rossell
0c42efd9d7 SDL2: fix creation of libSDL2main.a
It's required by a trigger rally update I will commit next.
And other games use that too.
2017-02-16 22:24:40 +01:00
Cray Elliott
d62d26251d SDL2: 2.0.4 -> 2.0.5 2017-02-02 15:36:00 -08:00
Carles Pagès
fd400ced6b Rename page to cpages to match github
I also updated the mail.
2017-01-20 16:55:29 +01:00
Linus Heckemann
da70d3da0f SDL2: split derivation 2016-12-26 01:35:43 +03:00