diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-08-19 10:46:59 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-08-19 11:05:05 +0300 |
| commit | d2ec1f8ed6576b5d0df1544b2e0e6603b1adfb5d (patch) | |
| tree | b527b1c49f8030e581cc55bcc8fba6653c861610 | |
| parent | 56c39a07c8adb8130bb1293ccbe84cfe3e442a95 (diff) | |
| download | guix-d2ec1f8ed6576b5d0df1544b2e0e6603b1adfb5d.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/engineering.scm | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 0f4162f12b..806aa37dfa 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) |