summary refs log tree commit diff
path: root/gnu/packages/engineering.scm
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-11-29 15:38:59 +0100
committerMathieu Othacehe <othacehe@gnu.org>2021-11-30 21:27:13 +0100
commita5cdd82ecd0136346d5716f9d7f093fcb684cd66 (patch)
treeab7969781118f12dee4ba6d4ef345c80e445ebe3 /gnu/packages/engineering.scm
parentafc4945d44aeb6750b980abddbfda66f6ccb6b18 (diff)
downloadguix-a5cdd82ecd0136346d5716f9d7f093fcb684cd66.tar.gz
gnu: freecad: Switch to vtk-9.
Switch to vtk-9 with the relevant patch to be able to get rid of vtk-8.

* gnu/packages/patches/freecad-vtk9.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/engineering.scm (freecad)[source]: Use it.
Diffstat (limited to 'gnu/packages/engineering.scm')
-rw-r--r--gnu/packages/engineering.scm19
1 files changed, 10 insertions, 9 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 99add779cb..0e3325ed80 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2373,14 +2373,15 @@ comments.")))
     (name "freecad")
     (version "0.19.2")
     (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/FreeCAD/FreeCAD")
-               (commit version)))
-        (file-name (git-file-name name version))
-        (sha256
-          (base32 "0fhjv0x3dix1c7jml91yx63z9xifjlbhjbcdb73lw80smpxrq7mm"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/FreeCAD/FreeCAD")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fhjv0x3dix1c7jml91yx63z9xifjlbhjbcdb73lw80smpxrq7mm"))
+       (patches (search-patches "freecad-vtk9.patch"))))
     (build-system qt-build-system)
     (native-inputs
      `(("doxygen" ,doxygen)
@@ -2427,7 +2428,7 @@ comments.")))
        ("qtxmlpatterns" ,qtxmlpatterns)
        ("sqlite" ,sqlite)
        ("tbb" ,tbb)
-       ("vtk" ,vtk-8)
+       ("vtk" ,vtk)
        ("xerces-c" ,xerces-c)
        ("zlib" ,zlib)))
     (arguments