diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-21 04:57:29 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-21 05:02:52 -0400 |
| commit | c52872bfc418c6b2273f973dff8003ca9e062792 (patch) | |
| tree | 4184a250e6d8363b3901aa2abe6910ff08ce08d4 /gnu/packages/engineering.scm | |
| parent | 65bb22796f854cbc3eae053a80b1d64365dad376 (diff) | |
| parent | 3fe49e50153fec1dabac35e262a0888044f79aa6 (diff) | |
| download | guix-c52872bfc418c6b2273f973dff8003ca9e062792.tar guix-c52872bfc418c6b2273f973dff8003ca9e062792.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/engineering.scm')
| -rw-r--r-- | gnu/packages/engineering.scm | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ee62eb5a8b..e6a29554f1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -582,24 +582,19 @@ as well as pick-place files.") (sha256 (base32 "1r40kyx30wz31cwwlfvfh7fgqkxq3n8dxhswpi9qpf4r5h3l8wsn")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (snippet + ;; Remove bundled catch since we provide our own. + '(delete-file "libfive/test/catch.hpp")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; no "test" target + `(#:test-target "libfive-test" #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-native-compilation (lambda _ (substitute* "CMakeLists.txt" (("-march=native") "")) - #t)) - (add-before 'build 'add-eigen-to-search-path - (lambda* (#:key inputs #:allow-other-keys) - ;; Allow things to find our own Eigen and Catch. - (let ((eigen (assoc-ref inputs "eigen"))) - (setenv "CPLUS_INCLUDE_PATH" - (string-append eigen "/include/eigen3:" - (getenv "CPLUS_INCLUDE_PATH"))) - #t)))))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs |