ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 13:28:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: f3d: Update to 2.0.0.

Browse source 
* gnu/packages/graphics.scm (f3d): Update to 2.0.0.
[source]: Update substitute paths and add patch for breaking change to
cxxopts.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Greg Hogan 2023-05-11 19:41:37 +00:00 committed by Ludovic Courtès
parent 7db7d4476f
commit c1007786fd
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/graphics.scm
View file

@ -2483,7 +2483,7 @@ (define-public mmg
(define-public f3d
(package
(name "f3d")
(version "1.3.1")
(version "2.0.0")
(source
(origin
(method git-fetch)
@ -2492,16 +2492,21 @@ (define-public f3d
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32 "0hdfgwf5d24ykab634xg4vv9r09nh96ss7hhnqnh5nmw4abhxzg7"))
(base32 "1gcwpdkz3ylaxi133zri1cxkvj6za5s1hbgqqc8fn10q2dkkdd44"))
(modules '((guix build utils)))
(snippet
#~(begin
(delete-file "application/cxxopts.hpp")
(delete-file "application/json.hpp")
(delete-file "external/cxxopts.hpp")
(delete-file "external/json.hpp")
(substitute* "application/F3DOptionsParser.cxx"
(("^#include \"cxxopts\\.hpp\"")
"#include <cxxopts.hpp>")
(("^#include \"json\\.hpp\"")
"#include <nlohmann/json.hpp>")
(("cxxopts::OptionException")
"cxxopts::exceptions::parsing"))
(substitute* "library/src/engine.cxx"
(("^#include <json\\.hpp>")
"#include <nlohmann/json.hpp>"))))))
(build-system cmake-build-system)
;; The package cannot easily be split into out and lib outputs because