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
adisbladis
119b1b630d
Merge pull request #72999 from adisbladis/mesa-19_2_3
...
mesa: 19.2.1 -> 19.2.3 (and associated fixes)
2019-11-10 13:08:37 +00:00
adisbladis
d5937a8096
qt5/libsForQt5: Switch MacOS to Qt 5.12 by default
...
Qt 5.11 does not build after the latest mesa update
2019-11-10 12:48:06 +00:00
adisbladis
c9774cb6e5
qt512.qtbase: Fix darwin build
2019-11-10 12:47:59 +00:00
Vladimír Čunát
802c81efa4
Merge #71401 : unzip: CVE-2019-13232 (into staging)
2019-11-09 15:29:58 +01:00
Thomas Tuegel
735894c103
Merge pull request #71745 from r-ryantm/auto-update/phonon-qt5
...
libsForQt5.phonon: 4.10.3 -> 4.11.1
2019-11-09 08:16:12 -06:00
Roman Timushev
dfac4a0f43
cfn-lint: propagate setuptools
2019-11-09 14:36:18 +01:00
adisbladis
7668f680da
libretro: Dont use libGLU_combined
2019-11-09 10:34:52 +00:00
adisbladis
01543a4843
clutter: Don't use libGLU_combined
2019-11-09 10:34:52 +00:00
adisbladis
ec8fc7b97f
cogl: Apply patches to work with mesa 19.2.3
2019-11-09 10:34:52 +00:00
adisbladis
803f9cce9d
fltk: Don't use libGLU_combined
2019-11-09 10:34:52 +00:00
adisbladis
317958d27b
ftgl: Don't use libGLU_combined
2019-11-09 10:34:52 +00:00
adisbladis
53731cbe78
leptonica: Don't use libGLU_combined
2019-11-09 10:34:51 +00:00
adisbladis
2f292f0bda
gle: Don't use libGLU_combined
2019-11-09 10:34:51 +00:00
adisbladis
f509874f91
libglvnd: Apply patches to work with mesa 19.2.3
2019-11-09 10:34:51 +00:00
adisbladis
87e4e71e0f
vtk: Fix build with mesa 19.2.3
2019-11-09 10:34:51 +00:00
adisbladis
1dc80934f0
libtxc_dxtn_s2tc: Don't use libGLU_combined
2019-11-09 10:34:51 +00:00
adisbladis
46ff2efc72
libtxc_dxtn: Don't use libGLU_combined
2019-11-09 10:34:50 +00:00
adisbladis
2de37c4698
openscenegraph: Don't use libGLU_combined
2019-11-09 10:34:50 +00:00
adisbladis
4b616ab19a
mutter: Fix build with mesa 19.2.3
2019-11-09 10:34:50 +00:00
adisbladis
a6929e9ff3
xorg.xorgserver: Fix build with mesa 19.2.3
2019-11-09 10:34:50 +00:00
adisbladis
1733a6f941
mesa: 19.2.1 -> 19.2.3
2019-11-09 10:34:50 +00:00
adisbladis
52997f11ca
coin3d: Don't use libGLU_combined
2019-11-09 10:34:49 +00:00
adisbladis
5d24b1e97a
webkitgtk: Don't use libGLU_combined
2019-11-09 10:34:49 +00:00
adisbladis
cd1a02a4ba
pythonPackages.pyside: Add missing input libGL
2019-11-09 10:34:49 +00:00
adisbladis
d053944e7b
octave: Don't use libGLU_combined
2019-11-09 10:34:49 +00:00
adisbladis
5e433b48dc
retroarch: Don't use libGLU_combined
2019-11-09 10:34:49 +00:00
adisbladis
13acfd0e28
maim: Don't use libGLU_combined
2019-11-09 10:34:49 +00:00
adisbladis
f6eb4b065b
kodi: Don't use libGLU_combined
2019-11-09 10:34:48 +00:00
Vladimír Čunát
f364708ce9
Merge #72092 : libtiff: 4.0.10 -> 4.1.0 (security)
...
into staging. This fixes CVE-2019-7663 and incorporates other patches.
2019-11-09 10:13:06 +01:00
Vladimír Čunát
832f46a703
gst-plugins-base: use fetchpatch for better hash stability
...
/cc original PR #70283 .
2019-11-09 07:51:00 +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
5132cc822a
Merge pull request #72812 from NixOS/bash-no-undef-vars
...
cc-wrapper, bintools-wrapper: Remove now unneeded `set {+,-}u`
2019-11-08 15:26:14 -05:00
John Ericson
f7fdc997bf
Merge commit 'afa48f16f265fd3e88073bca7929e1e103bd3dc3' into bash-no-undef-vars
2019-11-08 13:58:27 -05:00
John Ericson
784c3dc0f9
qt5 qmake setup hook: qmakeFlags
may be undefined
2019-11-08 13:28:59 -05:00
John Ericson
ca782498a9
emacs package setup hook: Fix
...
1. Make the test more robust
2. EMACSLOADPATH may be initially undefined.
3. did `targetOffset` twice when meant `hostOffset` too
2019-11-08 13:28:59 -05:00
John Ericson
f1481f2c90
apple-sdk setup hooks: NIX_CFLAGS_COMPILE may be undefined
2019-11-08 13:28:59 -05:00
John Ericson
6fb526b32c
findlib setup hook: createFindlibDestdir
may not be defined
2019-11-08 13:28:59 -05:00
John Ericson
908b143e51
gstreamer: GST_PLUGIN_SYSTEM_PATH.* may be undefined
2019-11-08 13:28:59 -05:00
John Ericson
12a85a7046
SDL, SDL2: SDL{,2}_PATH may be undefined
2019-11-08 13:28:58 -05:00
John Ericson
beda0365a6
darwin private frameworks setup hook: NIX_CFLAGS_COMPILE may be undefined
2019-11-08 13:24:20 -05:00
John Ericson
b78e84097f
gdk-pixbuf setup hook: GDK_PIXBUF_MODULE_FILE might not be defined
...
Also switch to [[ ... ]] because it is more robust w.r.t. empty
arguments.
2019-11-08 13:24:20 -05:00
John Ericson
aaf0fd2c44
lua-5 setup hook: LUA_PATH and LUA_CPATH can be undefined
2019-11-08 13:24:20 -05:00
John Ericson
0b90a7f67f
lispPackages.clwrapper: NIX_LISP_LD_LIBRARY_PATH might be undefined
2019-11-08 13:24:20 -05:00
John Ericson
67cc85ec67
OCaml findlib: OCAMLPATH could be undefined
2019-11-08 13:24:20 -05:00
John Ericson
9167482d12
opensp: sgmlHookDone
can be undefined
2019-11-08 13:24:20 -05:00
John Ericson
42ffaf5290
cmake: NIX_CFLAGS_COMPILE NIX_LDFLAG could be undefined
2019-11-08 13:24:20 -05:00
John Ericson
770a4c7946
glib: Fix setup hook
...
It was not robust against multiple matching directories, as the called
function takes exactly 3 arguments.
2019-11-08 13:24:18 -05:00
R. RyanTM
d3cf60344b
zotero: 5.0.73 -> 5.0.77 ( #72693 )
2019-11-07 23:29:28 +01:00
Matthew Bauer
c10098322a
Merge pull request #70244 from nmattia/nm-fix-libcxx
...
libcxx: fix build on linux musl
2019-11-07 17:13:09 -05:00