me
/
guix
Archived
1
0
Fork 0
Code

gnu: json-modern-cxx: Remove input labels. 

* gnu/packages/cpp.scm (json-modern-cxx)[native-inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-FILE.
master
Marius Bakke 2022-01-30 17:40:01 +01:00
parent 018d2c1243
commit 7ad2cfcc72
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 14 additions and 14 deletions
gnu/packages

28
gnu/packages/cpp.scm
View File

@ -528,7 +528,9 @@ as ordering relation.")
'(#:configure-flags '(#:configure-flags
(list "-DJSON_MultipleHeaders=ON" ; For json_fwd.hpp. (list "-DJSON_MultipleHeaders=ON" ; For json_fwd.hpp.
(string-append "-DJSON_TestDataDirectory=" (string-append "-DJSON_TestDataDirectory="
(assoc-ref %build-inputs "json_test_data"))) (dirname
(search-input-directory %build-inputs
"json_nlohmann_tests"))))
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(replace 'check (replace 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys) (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
@ -540,19 +542,17 @@ as ordering relation.")
"1")) "1"))
(format #t "test suite not run~%"))))))) (format #t "test suite not run~%")))))))
(native-inputs (native-inputs
`(("amalgamate" ,amalgamate) (list amalgamate doctest
("doctest" ,doctest) (let ((version "3.0.0"))
("json_test_data" (origin
,(let ((version "3.0.0")) (method git-fetch)
(origin (uri (git-reference
(method git-fetch) (url "https://github.com/nlohmann/json_test_data")
(uri (git-reference (commit (string-append "v" version))))
(url "https://github.com/nlohmann/json_test_data") (file-name (git-file-name "json_test_data" version))
(commit (string-append "v" version)))) (sha256
(file-name (git-file-name "json_test_data" version)) (base32
(sha256 "0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv"))))))
(base32
"0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv")))))))
(inputs (inputs
(list fifo-map)) (list fifo-map))
(synopsis "JSON parser and printer library for C++") (synopsis "JSON parser and printer library for C++")