me
/
guix
Archived
1
0
Fork 0
Code

gnu: libfive: Update to 0-3.6e39254. 

* gnu/packages/engineering.scm (libfive): Update to 0-3.6e39254.
[arguments]: Add build phase "find-catch".
[inputs]: Replace catch-framework with catch-framework2.
[license]: Change license for library.
master
Ricardo Wurmus 2019-12-19 23:14:54 +01:00
parent 8aa59a54e9
commit 6a0b9500f9
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/engineering.scm
View File

@ -713,8 +713,8 @@ fonts to gEDA.")
(license license:gpl2+)))) (license license:gpl2+))))
(define-public libfive (define-public libfive
(let ((commit "9d857d1923abecb0e5935b9287d22661f6efaac5") (let ((commit "6e39254e57c179459bb929df49ae96a6017a0ed6")
(revision "2")) (revision "3"))
(package (package
(name "libfive") (name "libfive")
(version (git-version "0" revision commit)) (version (git-version "0" revision commit))
@ -725,7 +725,7 @@ fonts to gEDA.")
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"1r40kyx30wz31cwwlfvfh7fgqkxq3n8dxhswpi9qpf4r5h3l8wsn")) "0ryv2hcbrwqc087w7rrs4a2irkcpmqync00g4dh8n7jn10w2jkim"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(snippet (snippet
;; Remove bundled catch since we provide our own. ;; Remove bundled catch since we provide our own.
@ -740,12 +740,18 @@ fonts to gEDA.")
(add-after 'unpack 'remove-native-compilation (add-after 'unpack 'remove-native-compilation
(lambda _ (lambda _
(substitute* "CMakeLists.txt" (("-march=native") "")) (substitute* "CMakeLists.txt" (("-march=native") ""))
#t))
(add-after 'unpack 'find-catch
(lambda* (#:key inputs #:allow-other-keys)
(setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "catch")
"/include/catch"))
#t))))) #t)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("catch" ,catch-framework) ("catch" ,catch-framework2)
("libpng" ,libpng) ("libpng" ,libpng)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("eigen" ,eigen) ("eigen" ,eigen)
@ -758,7 +764,7 @@ libfive, solid models are defined as Scheme scripts, and there are no opaque
function calls into the geometry kernel: everything is visible to the user. function calls into the geometry kernel: everything is visible to the user.
Even fundamental, primitive shapes are represented as code in the user-level Even fundamental, primitive shapes are represented as code in the user-level
language.") language.")
(license (list license:lgpl2.1+ ;library (license (list license:mpl2.0 ;library
license:gpl2+))))) ;Guile bindings and GUI license:gpl2+))))) ;Guile bindings and GUI
(define-public ao (define-public ao