diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-26 14:51:18 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2020-11-26 14:51:18 -0500 |
| commit | 492f3b80abad67261d1da0fbc415749f9a51c2ee (patch) | |
| tree | c9dd11c7088175ccf85e9c6e7f90ec5feae36ce7 /pkgs/applications/misc/blender/default.nix | |
| parent | d9d8c8a7fc5c46aff67d500297e3c5a53e055d73 (diff) | |
| download | nixpkgs-492f3b80abad67261d1da0fbc415749f9a51c2ee.tar nixpkgs-492f3b80abad67261d1da0fbc415749f9a51c2ee.tar.gz nixpkgs-492f3b80abad67261d1da0fbc415749f9a51c2ee.tar.bz2 nixpkgs-492f3b80abad67261d1da0fbc415749f9a51c2ee.tar.lz nixpkgs-492f3b80abad67261d1da0fbc415749f9a51c2ee.tar.xz nixpkgs-492f3b80abad67261d1da0fbc415749f9a51c2ee.tar.zst nixpkgs-492f3b80abad67261d1da0fbc415749f9a51c2ee.zip | |
blender: fix on darwin
Diffstat (limited to 'pkgs/applications/misc/blender/default.nix')
| -rw-r--r-- | pkgs/applications/misc/blender/default.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 882139794c9..9796aef9b7c 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -8,7 +8,7 @@ , cudaSupport ? config.cudaSupport or false, cudatoolkit , colladaSupport ? true, opencollada , makeWrapper -, pugixml, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL +, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL , embree, gmp }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { openvdb ] else [ - pugixml SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL + pugixml llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) ++ optional jackaudioSupport libjack2 ++ optional cudaSupport cudatoolkit @@ -61,7 +61,9 @@ stdenv.mkDerivation rec { : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ - '${python}' + '${python}' \ + --replace '${"$"}{LIBDIR}/openmp' \ + '${llvmPackages.openmp}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ --replace 'set(PYTHON_VERSION 3.7)' \ 'set(PYTHON_VERSION ${python.pythonVersion})' \ @@ -72,15 +74,7 @@ stdenv.mkDerivation rec { --replace '${"$"}{LIBDIR}/opencollada' \ '${opencollada}' \ --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python3Packages.numpy}/${python.sitePackages}/numpy' \ - --replace 'set(OPENJPEG_INCLUDE_DIRS ' \ - 'set(OPENJPEG_INCLUDE_DIRS "'$(echo ${openjpeg.dev}/include/openjpeg-*)'") #' \ - --replace 'set(OPENJPEG_LIBRARIES ' \ - 'set(OPENJPEG_LIBRARIES "${openjpeg}/lib/libopenjp2.dylib") #' \ - --replace 'set(OPENIMAGEIO ' \ - 'set(OPENIMAGEIO "${openimageio2.out}") #' \ - --replace 'set(OPENEXR_INCLUDE_DIRS ' \ - 'set(OPENEXR_INCLUDE_DIRS "${openexr.dev}/include/OpenEXR") #' + '${python3Packages.numpy}/${python.sitePackages}/numpy' '' else '' substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' ''); |