Merge pull request #108300 from siraben/parallel-cmake

treewide: remove enableParallelBuilding = true if using cmake
This commit is contained in:
John Ericson
2021-01-03 13:22:09 -05:00
committed by GitHub
378 changed files with 15 additions and 724 deletions

View File

@@ -47,7 +47,6 @@ in stdenv.mkDerivation rec {
"-DUSE_SSE=ON"
"-DUSE_SSE42=ON"
];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "Open source, physically-based global illumination rendering engine";

View File

@@ -62,8 +62,6 @@ stdenv.mkDerivation rec {
done
'';
enableParallelBuilding = true;
# Same as vulkan-validation-layers
libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];
dontPatchELF = true;

View File

@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ python3 vulkan-headers vulkan-loader xlibsWrapper libxcb libXrandr wayland ];
enableParallelBuilding = true;
libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ];