me/guix
Archived
1
0
Fork 0
Code Activity

gnu: libfive: Fix build.

Browse source 
* gnu/packages/engineering.scm (libfive)[source]: Remove snippet.
[arguments]: Remove custom phase to find catch's header.
[native-inputs]: Remove catch-framework2.
This commit is contained in:
Efraim Flashner 2020-08-19 10:46:59 +03:00
parent 56c39a07c8
commit d2ec1f8ed6
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/engineering.scm
View file

@ -766,12 +766,7 @@ fonts to gEDA.")
(sha256 (sha256
(base32 (base32
"0ryv2hcbrwqc087w7rrs4a2irkcpmqync00g4dh8n7jn10w2jkim")) "0ryv2hcbrwqc087w7rrs4a2irkcpmqync00g4dh8n7jn10w2jkim"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))))
(snippet
;; Remove bundled catch since we provide our own.
'(begin
(delete-file "libfive/test/catch.hpp")
#t))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:test-target "libfive-test" `(#:test-target "libfive-test"
@ -780,19 +775,11 @@ 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/catch2:"
(or (getenv "CPLUS_INCLUDE_PATH") "")))
#t))))) #t)))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
`(("boost" ,boost) `(("boost" ,boost)
("catch" ,catch-framework2)
("libpng" ,libpng) ("libpng" ,libpng)
("qtbase" ,qtbase) ("qtbase" ,qtbase)
("eigen" ,eigen) ("eigen" ,eigen)