Commit graph

11 commits

Author SHA1 Message Date
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
xeji 980dd63141 epoxy: 1.3.1 -> 1.5.0 2018-03-02 00:26:09 +01:00
Alexander V. Nikolaev 0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
xeji a7a0d78f1c epoxy: add mesa to libepoxy runpath as fallback
- libepoxy dlopen()s libEGL / libGL but didn't have mesa in its runpath
  -> error unless lib is already open or in LD_LIBRARY_PATH
- change dependency from mesa (should be avoided) to mesa_nonglu
2018-02-23 10:38:34 +01:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03: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
Jude Taylor 950261bb9a darwin: fix gtk+3 dependencies 2015-10-27 00:38:06 -07:00
Vladimír Čunát 0a0e41b083 epoxy: split the "dev" output 2015-10-13 20:18:53 +02:00
William A. Kennington III 0bbe804f0a epoxy: 1.2 -> 1.3.1 2015-08-13 15:00:18 -07:00
Spencer Whitt 3d60104a74 libepoxy: enable on Darwin 2015-05-22 20:10:53 -04:00
Cillian de Róiste e7bb85e448 Add epoxy: A library for handling OpenGL function pointer management 2014-07-27 12:14:38 +02:00