diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:57:35 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-05 17:57:35 +0100 |
| commit | 9d5aa009062a49bd035ae33e37f6562526e7d38c (patch) | |
| tree | 4ff2302863a5cf9f3cf604240ea793152156f532 /gnu/packages/graphics.scm | |
| parent | 60bd56c6d8368c23dcd97b26501771c82316fc8c (diff) | |
| parent | 2c2fc24b899d3286774f60405888718d98211213 (diff) | |
| download | guix-9d5aa009062a49bd035ae33e37f6562526e7d38c.tar guix-9d5aa009062a49bd035ae33e37f6562526e7d38c.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4f1c50b272..3ef420cf05 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages swig) + #:use-module (gnu packages tbb) #:use-module (gnu packages video) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -87,14 +88,14 @@ (define-public blender (package (name "blender") - (version "2.80") + (version "2.81") (source (origin (method url-fetch) (uri (string-append "https://download.blender.org/source/" - "blender-" version ".tar.gz")) + "blender-" version ".tar.xz")) (sha256 (base32 - "1h550jisdbis50hxwk5kxrvrk1a6sh2fsri3yyj66vhzbi87x7fd")))) + "1prp0f2152f1sz23jlc86vndfvmplb7qhllikkirq7hgpykrshna")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) @@ -145,6 +146,8 @@ `(("boost" ,boost) ("jemalloc" ,jemalloc) ("libx11" ,libx11) + ("libxi" ,libxi) + ("libxrender" ,libxrender) ("openimageio" ,openimageio) ("openexr" ,openexr) ("opensubdiv" ,opensubdiv) @@ -162,6 +165,7 @@ ("openal" ,openal) ("python" ,python) ("python-numpy" ,python-numpy) + ("tbb" ,tbb) ("zlib" ,zlib))) (home-page "https://blender.org/") (synopsis "3D graphics creation suite") @@ -758,7 +762,7 @@ realistic reflections, shading, perspective and other effects.") ("graphviz" ,graphviz) ("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("xvfb" ,xorg-server))) + ("xvfb" ,xorg-server-for-tests))) (home-page "https://rapicorn.testbit.org/") (synopsis "Toolkit for rapid development of user interfaces") (description @@ -1055,7 +1059,7 @@ requirements.") (setenv "DISPLAY" ":1") #t))))) (native-inputs - `(("xorg-server" ,xorg-server))) + `(("xorg-server" ,xorg-server-for-tests))) (inputs `(("glew" ,glew) ("libxrandr" ,libxrandr) |