diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
| commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
| tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/graphics.scm | |
| parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
| parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f9f19cc28d6..2c25c5405ba 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -503,14 +503,14 @@ typically encountered in feature film production.") (define-public blender (package (name "blender") - (version "2.91.0") + (version "2.92.0") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" "blender-" version ".tar.xz")) (sha256 (base32 - "0x396lgmk0dq9115yrc36s8zwxzmjr490sr5n2y6w27y17yllyjm")))) + "15a5vffn18a920286x0avbc2rap56k6y531wgibq68r90g2cz4g7")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) @@ -527,6 +527,7 @@ typically encountered in feature film production.") "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_JACK=ON" "-DWITH_MOD_OCEANSIM=ON" + "-DWITH_OPENVDB=ON" "-DWITH_OPENSUBDIV=ON" "-DWITH_PYTHON_INSTALL=OFF" (string-append "-DPYTHON_LIBRARY=python" ,python-version) @@ -535,6 +536,9 @@ typically encountered in feature film production.") (string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python") "/include/python" ,python-version) (string-append "-DPYTHON_VERSION=" ,python-version) + (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS=" + (assoc-ref %build-inputs "python-numpy") + "/lib/python" ,python-version "/site-packages/numpy/core/include/") (string-append "-DPYTHON_NUMPY_PATH=" (assoc-ref %build-inputs "python-numpy") "/lib/python" ,python-version "/site-packages/")) @@ -582,6 +586,7 @@ typically encountered in feature film production.") ("pugixml" ,pugixml) ("python" ,python) ("python-numpy" ,python-numpy) + ("openvdb" ,openvdb) ("tbb" ,tbb) ("zlib" ,zlib) ("embree" ,embree))) |