summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2020-11-12 17:14:00 +0100
committerRicardo Wurmus <rekado@elephly.net>2020-11-13 21:42:45 +0100
commit4e9b2e8ba26dd601df67f112852237d5df2f3341 (patch)
tree925ee3d039c6449786429621da92ddc94f695d41
parentdd012afde475e44cc71ccbf250e8ed0ee1e0e853 (diff)
downloadguix-4e9b2e8ba26dd601df67f112852237d5df2f3341.tar.gz
gnu: inspekt3d: Build with Guile 3.
* gnu/packages/engineering.scm (inspekt3d)
[source]: Add snippet to allow building with Guile 3.0.
[inputs]: Replace guile-2.2 with guile-3.0.
[propagated-inputs]: Replace guile-opengl with guile3.0-opengl.
-rw-r--r--gnu/packages/engineering.scm13
1 files changed, 10 insertions, 3 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 596b8a79ab..3da11e3fed 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -810,7 +810,14 @@ language.")
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0lan6930g5a9z4ack9jj0zdd0mb2s6q2xzpiwcjdc3pvl9b1nbw4"))))
+                  "0lan6930g5a9z4ack9jj0zdd0mb2s6q2xzpiwcjdc3pvl9b1nbw4"))
+                (modules '((guix build utils)))
+                (snippet
+                 '(begin
+                    ;; Allow builds with Guile 3.0.
+                    (substitute* "configure.ac"
+                      (("2\\.2") "3.0 2.2"))
+                    #t))))
       (build-system gnu-build-system)
       (arguments
        `(#:phases
@@ -829,10 +836,10 @@ language.")
          ("pkg-config" ,pkg-config)))
       (inputs
        `(("mesa" ,mesa)
-         ("guile" ,guile-2.2)))
+         ("guile" ,guile-3.0)))
       (propagated-inputs
        `(("libfive" ,libfive)
-         ("guile-opengl" ,guile-opengl)))
+         ("guile-opengl" ,guile3.0-opengl)))
       (home-page "https://gitlab.com/kavalogic-inc/inspekt3d/")
       (synopsis "Lightweight 3D viewer for Libfive written in Guile Scheme")
       (description