diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-13 23:34:58 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-13 23:34:58 +0200 |
| commit | 4442a5db773f79e05c37e014c63b4298e7de666b (patch) | |
| tree | 880a6fdce7b288eaa506828b9b500191ca60ce24 /gnu/packages/image-processing.scm | |
| parent | 5b48591176a08bddfd0147bd854785fb4f6a62ba (diff) | |
| parent | b160795a0b65d67ff5d64447f1b97c2f009517a0 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/image-processing.scm')
| -rw-r--r-- | gnu/packages/image-processing.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 0c25b41dad..bcb1d7a2f6 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2021 Oleh Malyi <astroclubzp@gmail.com> -;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> +;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Andy Tai <atai@atai.org> ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech> ;;; Copyright © 2021 Paul Garlick <pgarlick@tourbillion-technology.com> @@ -194,7 +194,8 @@ licences similar to the Modified BSD licence.")))) (sha256 (base32 "0qpcd3n26q52dpyibm11f5l6cgscdr54p2jish39gc3p1f5h3ws1")) - (patches (search-patches "mia-fix-boost-headers.patch")))) + (patches (search-patches "mia-fix-boost-headers.patch" + "mia-vtk9.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -221,10 +222,7 @@ licences similar to the Modified BSD licence.")))) nlopt openexr-2 python-lxml - ;; The build fails when using the regular VTK (currently at version - ;; 9), with error "addons/vtk/vtkvf.cc:23:10: fatal error: - ;; vtkStructuredPointsReader.h: No such file or directory". - vtk-7)) + vtk)) (native-inputs (list pkg-config python-wrapper)) |