Commit 36d97f54 authored by Andrew Marshall's avatar Andrew Marshall
Browse files

blender: use release config 

This ensures that we at least default to the config that upstream
Blender uses. Remove any config that we have that is redundant with [the
current upstream][1]. Need to explicitly turn off
`WITH_CYCLES_CUDA_BINARIES` in non-CUDA (as release build will turn it
on) and turn off `WITH_CYCLES_DEVICE_ONEAPI` (as it was previously
implicitly off and we do not currently support it).

[1]: https://projects.blender.org/blender/blender/src/tag/v4.5.2/build_files/cmake/config/blender_release.cmake
parent e29dd23c

pkgs/by-name/bl/blender/package.nix

+3 −12
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ stdenv'.mkDerivation (finalAttrs: { 
  env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}";



  cmakeFlags = [

    "-C../build_files/cmake/config/blender_release.cmake"

    "-DMaterialX_DIR=${python3Packages.materialx}/lib/cmake/MaterialX"

    "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"

    "-DPYTHON_LIBPATH=${python3}/lib"
@@ -153,36 +154,26 @@ stdenv'.mkDerivation (finalAttrs: { 
    "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include"

    "-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}"

    "-DPYTHON_VERSION=${python3.pythonVersion}"

    "-DWITH_ALEMBIC=ON"

    "-DWITH_ASSERT_ABORT=OFF"

    "-DWITH_BUILDINFO=OFF"

    "-DWITH_CODEC_FFMPEG=ON"

    "-DWITH_CODEC_SNDFILE=ON"

    "-DWITH_CPU_CHECK=OFF"

    "-DWITH_CYCLES_CUDA_BINARIES=${if cudaSupport then "ON" else "OFF"}"

    "-DWITH_CYCLES_DEVICE_HIP=${if hipSupport then "ON" else "OFF"}"

    "-DWITH_CYCLES_DEVICE_ONEAPI=OFF"

    "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}"

    "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}"

    "-DWITH_CYCLES_OSL=OFF"

    "-DWITH_FFTW3=ON"

    "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}"

    "-DWITH_IMAGE_OPENJPEG=ON"

    "-DWITH_INSTALL_PORTABLE=OFF"

    "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}"

    "-DWITH_LIBS_PRECOMPILED=OFF"

    "-DWITH_MOD_OCEANSIM=ON"

    "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}"

    "-DWITH_OPENCOLORIO=ON"

    "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}"

    "-DWITH_OPENSUBDIV=ON"

    "-DWITH_OPENVDB=ON"

    "-DWITH_PIPEWIRE=OFF"

    "-DWITH_PULSEAUDIO=OFF"

    "-DWITH_PYTHON_INSTALL=OFF"

    "-DWITH_PYTHON_INSTALL_NUMPY=OFF"

    "-DWITH_PYTHON_INSTALL_REQUESTS=OFF"

    "-DWITH_SDL=OFF"

    "-DWITH_STRICT_BUILD_OPTIONS=ON"

    "-DWITH_TBB=ON"

    "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}"



    # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file)