summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJake Forster <jakecameron.forster@gmail.com>2025-08-23 20:55:00 +0930
committerLudovic Courtès <ludo@gnu.org>2025-08-25 12:17:02 +0200
commite676c0d990b1135b6fadcf1014ffc1e30097d466 (patch)
tree0dd3a79ad6b0fe33010aae5a4f75061743802b3a
parentb8cbc0dda4090f40083cc3a6e9d9a40d6f34e7bb (diff)
gnu: paraview: Fix build with gcc-14.
* gnu/packages/image-processing.scm: Import (gnu packages engineering). (paraview): Use Guix's CGNS when building bundled VTK. [source]: Remove ".git" suffix from URL. Adjust snippet to also remove bundled VTK library cgns. [arguments]<#:configure-flags>: Add "-DVTK_MODULE_USE_EXTERNAL_VTK_cgns=ON". [inputs]: Add cgns. Change-Id: Id8e11fd772a05a3833446233de301b13263f76a3 Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--gnu/packages/image-processing.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 5dafd4e955d..e6a1e1ba31c 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -69,6 +69,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
+ #:use-module (gnu packages engineering)
#:use-module (gnu packages flex)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages game-development)
@@ -947,7 +948,7 @@ recalculates.")
(origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.kitware.com/paraview/paraview.git")
+ (url "https://gitlab.kitware.com/paraview/paraview")
(commit (string-append "v" version))
(recursive? #t)))
(file-name (git-file-name name version))
@@ -976,7 +977,7 @@ recalculates.")
(for-each (lambda (dir)
(delete-file-recursively
(string-append "VTK/ThirdParty/" dir "/vtk" dir)))
- '(;;"cgns"
+ '("cgns"
"cli11"
;;"diy2"
"doubleconversion"
@@ -1095,6 +1096,7 @@ recalculates.")
;; External libraries for ParaView and VTK
"-DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf=ON"
+ "-DVTK_MODULE_USE_EXTERNAL_VTK_cgns=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON"
"-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON"
@@ -1148,6 +1150,7 @@ recalculates.")
python-sphinx))
(inputs
(list boost
+ cgns
cli11
curl
double-conversion