Merge staging-next into staging
This commit is contained in:
commit
ea907d3660
|
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
configureFlags = [ "--with-boost=${boost.out}" ];
|
configureFlags = [ "--with-boost=${boost.out}" ];
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = !stdenv.cc.isClang;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
# Upstream uses the same intermediate files in multiple tests, running
|
# Upstream uses the same intermediate files in multiple tests, running
|
||||||
|
|
Loading…
Reference in a new issue