diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2021-01-30 17:58:10 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2021-01-30 17:59:34 +0100 |
| commit | e629d7221604726d404b4d280a38d9a698d32a30 (patch) | |
| tree | 5fba2a82b7343aa4570f924f8cde9d5b7670501e /gnu/packages/graphics.scm | |
| parent | deda7029e5b9eff1c3281ffc2bb0776c47fd7adf (diff) | |
| download | guix-e629d7221604726d404b4d280a38d9a698d32a30.tar guix-e629d7221604726d404b4d280a38d9a698d32a30.tar.gz | |
gnu: blender: Fix build.
* gnu/packages/graphics.scm (openimageio): Update to 2.2.10.1.
[arguments]: Do not use system pugixml.
[inputs]: Add fmt.
* gnu/packages/graphics.scm (blender)[inputs]: Add "pugixml".
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 411d89fcc2..5ed2531402 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> -;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com> @@ -84,6 +84,7 @@ #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages plotutils) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages pth) #:use-module (gnu packages pulseaudio) ; libsndfile, libsamplerate #:use-module (gnu packages python) @@ -538,6 +539,7 @@ applications.") ("freetype" ,freetype) ("glew" ,glew) ("openal" ,openal) + ("pugixml" ,pugixml) ("python" ,python) ("python-numpy" ,python-numpy) ("tbb" ,tbb) @@ -1088,7 +1090,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (define-public openimageio (package (name "openimageio") - (version "2.0.13") + (version "2.2.10.1") (source (origin (method git-fetch) (uri (git-reference @@ -1097,23 +1099,26 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (file-name (git-file-name name version)) (sha256 (base32 - "0czcls82v71wkw1syib16ncg7463hx0py0xclycsiv4w6i3wlkzz")))) + "0wzh5n527l7ia1754cf9xmbvv4ya6hj34dy6cbq9xk9372h8gd9q")))) (build-system cmake-build-system) ;; FIXME: To run all tests successfully, test image sets from multiple ;; third party sources have to be present. For details see - ;; https://github.com/OpenImageIO/oiio/blob/master/INSTALL + ;; <https://github.com/OpenImageIO/oiio/blob/master/INSTALL.md> (arguments - `(#:tests? #f)) + `(#:tests? #f + #:configure-flags (list "-DUSE_EXTERNAL_PUGIXML=1"))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("boost" ,boost) + ("fmt" ,fmt) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo) ("libtiff" ,libtiff) ("giflib" ,giflib) ("openexr" ,openexr) ("ilmbase" ,ilmbase) + ("pugixml" ,pugixml) ("python" ,python-wrapper) ("pybind11" ,pybind11) ("robin-map" ,robin-map) |