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

gnu: blender: Fix build by specifying path to Python libraries.

Browse source 
* gnu/packages/graphics.scm (blender)[arguments]: Specify the Python
dependency paths in #:configure-flags.
[inputs]: Replace python-wrapper with python.
This commit is contained in:
Leo Famulari 2018-01-18 16:50:24 -08:00
parent eb096cdeba
commit bb9cd6de32
No known key found for this signature in database
GPG key ID: 2646FA30BACA7F08
1 changed files with 44 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/graphics.scm
View file

@ -33,6 +33,7 @@ (define-module (gnu packages graphics)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module ((guix licenses) #:prefix license:) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix utils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
@ -88,6 +89,7 @@ (define-public blender
"16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9")))) "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(let ((python-version (version-major+minor (package-version python))))
`(;; Test files are very large and not included in the release tarball. `(;; Test files are very large and not included in the release tarball.
#:tests? #f #:tests? #f
#:configure-flags #:configure-flags
@ -104,7 +106,14 @@ (define-public blender
"-DWITH_MOD_OCEANSIM=ON" "-DWITH_MOD_OCEANSIM=ON"
"-DWITH_PLAYER=ON" "-DWITH_PLAYER=ON"
"-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_SYSTEM_OPENJPEG=ON") "-DWITH_PYTHON_INSTALL=OFF"
"-DWITH_SYSTEM_OPENJPEG=ON"
(string-append "-DPYTHON_LIBRARY=python" ,python-version "m")
(string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python")
"/lib")
(string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python")
"/include/python" ,python-version "m")
(string-append "-DPYTHON_VERSION=" ,python-version))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-broken-import (add-after 'unpack 'fix-broken-import
@ -121,7 +130,7 @@ (define-public blender
(string-append (assoc-ref inputs "ilmbase") (string-append (assoc-ref inputs "ilmbase")
"/include/OpenEXR" "/include/OpenEXR"
":" (or (getenv "CPATH") ""))) ":" (or (getenv "CPATH") "")))
#t))))) #t))))))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("jemalloc" ,jemalloc) ("jemalloc" ,jemalloc)
@ -140,7 +149,7 @@ (define-public blender
("freetype" ,freetype) ("freetype" ,freetype)
("glew" ,glew) ("glew" ,glew)
("openal" ,openal) ("openal" ,openal)
("python" ,python-wrapper) ("python" ,python)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://blender.org/") (home-page "https://blender.org/")
(synopsis "3D graphics creation suite") (synopsis "3D graphics creation suite")