ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-24 11:39:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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.
This commit is contained in:
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 @@ (define-public blender
#t)) #t))
(add-after 'set-paths 'add-ilmbase-include-path (add-after 'set-paths 'add-ilmbase-include-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; OpenEXR propagates ilmbase, but its include files do not appear ;; OpenEXR propagates ilmbase, but its include files do not
;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to ;; appear in the C_INCLUDE_PATH, so we need to add
;; the CPATH to satisfy the dependency on "half.h". ;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to satisfy
(setenv "CPATH" ;; the dependency on "half.h" and "Iex.h".
(string-append (let ((headers (string-append
(search-input-directory inputs "include/OpenEXR") (assoc-ref inputs "ilmbase")
":" (or (getenv "CPATH") ""))))))))) "/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 (inputs
`(("boost" ,boost) `(("boost" ,boost)
("jemalloc" ,jemalloc) ("jemalloc" ,jemalloc)
@ -585,7 +591,7 @@ (define-public blender
("python" ,python) ("python" ,python)
("python-numpy" ,python-numpy) ("python-numpy" ,python-numpy)
("openvdb" ,openvdb) ("openvdb" ,openvdb)
("tbb" ,tbb) ("tbb" ,tbb-2020)
("zlib" ,zlib) ("zlib" ,zlib)
("embree" ,embree))) ("embree" ,embree)))
(home-page "https://blender.org/") (home-page "https://blender.org/")