diff options
| author | NomisIV <simon@nomisiv.com> | 2020-12-15 19:10:38 +0100 |
|---|---|---|
| committer | NomisIV <simon@nomisiv.com> | 2020-12-15 19:10:38 +0100 |
| commit | 49ce410158710117591d50e8f05dfaa75a45ad25 (patch) | |
| tree | 3d1a1f4244869df71cfb2d5545f637c3a5fc3936 /pkgs/applications/misc/blender/default.nix | |
| parent | 8b41a83a355ddf0f0cc2d289f1ab05e07c343b98 (diff) | |
| download | nixpkgs-49ce410158710117591d50e8f05dfaa75a45ad25.tar nixpkgs-49ce410158710117591d50e8f05dfaa75a45ad25.tar.gz nixpkgs-49ce410158710117591d50e8f05dfaa75a45ad25.tar.bz2 nixpkgs-49ce410158710117591d50e8f05dfaa75a45ad25.tar.lz nixpkgs-49ce410158710117591d50e8f05dfaa75a45ad25.tar.xz nixpkgs-49ce410158710117591d50e8f05dfaa75a45ad25.tar.zst nixpkgs-49ce410158710117591d50e8f05dfaa75a45ad25.zip | |
blender: merged option optixSupport with cudaSupport
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index a7cef2c49b8..f001e20a380 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -6,7 +6,6 @@ , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath , jackaudioSupport ? false, libjack2 , cudaSupport ? config.cudaSupport or false, cudatoolkit -, optixSupport ? config.optixSupport or false , colladaSupport ? true, opencollada , makeWrapper , pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL @@ -116,8 +115,8 @@ in stdenv.mkDerivation rec { # Clang doesn't support "-export-dynamic" ++ optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" - ++ optional optixSupport [ + ++ optional cudaSupport [ + "-DWITH_CYCLES_CUDA_BINARIES=ON" "-DWITH_CYCLES_DEVICE_OPTIX=ON" "-DOPTIX_ROOT_DIR=${optix}" ]; |