me
/
guix
Archived
1
0
Fork 0
Code

gnu: blender: Use older TBB and update header variables. 

* gnu/packages/graphics.scm (blender)[inputs]: Replace tbb with tbb-2020.
[arguments]: Don't set CPATH; set C_INCLUDE_PATH and CPLUS_INCLUDE_PATH instead.
master
Ricardo Wurmus 2021-10-24 13:26:49 +00:00
parent 78ea1ce7d5
commit b3ac826e18
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/graphics.scm
View File

@ -552,13 +552,19 @@ typically encountered in feature film production.")
#t))
(add-after 'set-paths 'add-ilmbase-include-path
(lambda* (#:key inputs #:allow-other-keys)
;; OpenEXR propagates ilmbase, but its include files do not appear
;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
;; the CPATH to satisfy the dependency on "half.h".
(setenv "CPATH"
(string-append
(search-input-directory inputs "include/OpenEXR")
":" (or (getenv "CPATH") "")))))))))
;; OpenEXR propagates ilmbase, but its include files do not
;; appear in the C_INCLUDE_PATH, so we need to add
;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to satisfy
;; the dependency on "half.h" and "Iex.h".
(let ((headers (string-append
(assoc-ref inputs "ilmbase")
"/include/OpenEXR")))
(setenv "C_INCLUDE_PATH"
(string-append headers ":"
(or (getenv "C_INCLUDE_PATH") "")))
(setenv "CPLUS_INCLUDE_PATH"
(string-append headers ":"
(or (getenv "CPLUS_INCLUDE_PATH") ""))))))))))
(inputs
`(("boost" ,boost)
("jemalloc" ,jemalloc)
@ -585,7 +591,7 @@ typically encountered in feature film production.")
("python" ,python)
("python-numpy" ,python-numpy)
("openvdb" ,openvdb)
("tbb" ,tbb)
("tbb" ,tbb-2020)
("zlib" ,zlib)
("embree" ,embree)))
(home-page "https://blender.org/")