Merge branch 'master' into language-tool

This commit is contained in:
Jörg Thalheim 2017-11-21 12:35:19 +00:00 committed by GitHub
commit d0a94e47d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
dontDisableStatic = true;
enableParallelBuilding = true;
# Flaky: fatal error: pointer-constraints-....h: No such file or directory
#enableParallelBuilding = true;
# XXX: By default, SDL wants to dlopen() PulseAudio, in which case
# we must arrange to add it to its RPATH; however, `patchelf' seems