summaryrefslogtreecommitdiff
path: root/gnu
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 /gnu
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>
Diffstat (limited to 'gnu')
-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 @@
69 #:use-module (gnu packages curl) 69 #:use-module (gnu packages curl)
70 #:use-module (gnu packages docbook) 70 #:use-module (gnu packages docbook)
71 #:use-module (gnu packages documentation) 71 #:use-module (gnu packages documentation)
72 #:use-module (gnu packages engineering)
72 #:use-module (gnu packages flex) 73 #:use-module (gnu packages flex)
73 #:use-module (gnu packages fontutils) 74 #:use-module (gnu packages fontutils)
74 #:use-module (gnu packages game-development) 75 #:use-module (gnu packages game-development)
@@ -947,7 +948,7 @@ recalculates.")
947 (origin 948 (origin
948 (method git-fetch) 949 (method git-fetch)
949 (uri (git-reference 950 (uri (git-reference
950 (url "https://gitlab.kitware.com/paraview/paraview.git") 951 (url "https://gitlab.kitware.com/paraview/paraview")
951 (commit (string-append "v" version)) 952 (commit (string-append "v" version))
952 (recursive? #t))) 953 (recursive? #t)))
953 (file-name (git-file-name name version)) 954 (file-name (git-file-name name version))
@@ -976,7 +977,7 @@ recalculates.")
976 (for-each (lambda (dir) 977 (for-each (lambda (dir)
977 (delete-file-recursively 978 (delete-file-recursively
978 (string-append "VTK/ThirdParty/" dir "/vtk" dir))) 979 (string-append "VTK/ThirdParty/" dir "/vtk" dir)))
979 '(;;"cgns" 980 '("cgns"
980 "cli11" 981 "cli11"
981 ;;"diy2" 982 ;;"diy2"
982 "doubleconversion" 983 "doubleconversion"
@@ -1095,6 +1096,7 @@ recalculates.")
1095 1096
1096 ;; External libraries for ParaView and VTK 1097 ;; External libraries for ParaView and VTK
1097 "-DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf=ON" 1098 "-DVTK_MODULE_USE_EXTERNAL_ParaView_protobuf=ON"
1099 "-DVTK_MODULE_USE_EXTERNAL_VTK_cgns=ON"
1098 "-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=ON" 1100 "-DVTK_MODULE_USE_EXTERNAL_VTK_cli11=ON"
1099 "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON" 1101 "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON"
1100 "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON" 1102 "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON"
@@ -1148,6 +1150,7 @@ recalculates.")
1148 python-sphinx)) 1150 python-sphinx))
1149 (inputs 1151 (inputs
1150 (list boost 1152 (list boost
1153 cgns
1151 cli11 1154 cli11
1152 curl 1155 curl
1153 double-conversion 1156 double-conversion