[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: libfive: Fix build.
From: |
guix-commits |
Subject: |
02/03: gnu: libfive: Fix build. |
Date: |
Wed, 19 Aug 2020 04:06:15 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit d2ec1f8ed6576b5d0df1544b2e0e6603b1adfb5d
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Aug 19 10:46:59 2020 +0300
gnu: libfive: Fix build.
* gnu/packages/engineering.scm (libfive)[source]: Remove snippet.
[arguments]: Remove custom phase to find catch's header.
[native-inputs]: Remove catch-framework2.
---
gnu/packages/engineering.scm | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 0f4162f..806aa37 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -766,12 +766,7 @@ fonts to gEDA.")
(sha256
(base32
"0ryv2hcbrwqc087w7rrs4a2irkcpmqync00g4dh8n7jn10w2jkim"))
- (file-name (git-file-name name version))
- (snippet
- ;; Remove bundled catch since we provide our own.
- '(begin
- (delete-file "libfive/test/catch.hpp")
- #t))))
+ (file-name (git-file-name name version))))
(build-system cmake-build-system)
(arguments
`(#:test-target "libfive-test"
@@ -780,19 +775,11 @@ fonts to gEDA.")
(add-after 'unpack 'remove-native-compilation
(lambda _
(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)))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("boost" ,boost)
- ("catch" ,catch-framework2)
("libpng" ,libpng)
("qtbase" ,qtbase)
("eigen" ,eigen)