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

* gnu/packages/cpp.scm (json-modern-cxx)[native-inputs]: Remove labels.
[arguments]: Use SEARCH-INPUT-FILE.
This commit is contained in:
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

View file

@ -528,7 +528,9 @@ (define-public json-modern-cxx
'(#:configure-flags
(list "-DJSON_MultipleHeaders=ON" ; For json_fwd.hpp.
(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
(replace 'check
(lambda* (#:key tests? parallel-tests? #:allow-other-keys)
@ -540,19 +542,17 @@ (define-public json-modern-cxx
"1"))
(format #t "test suite not run~%")))))))
(native-inputs
`(("amalgamate" ,amalgamate)
("doctest" ,doctest)
("json_test_data"
,(let ((version "3.0.0"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nlohmann/json_test_data")
(commit (string-append "v" version))))
(file-name (git-file-name "json_test_data" version))
(sha256
(base32
"0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv")))))))
(list amalgamate doctest
(let ((version "3.0.0"))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/nlohmann/json_test_data")
(commit (string-append "v" version))))
(file-name (git-file-name "json_test_data" version))
(sha256
(base32
"0nzsjzlvk14dazwh7k2jb1dinb0pv9jbx5jsyn264wvva0y7daiv"))))))
(inputs
(list fifo-map))
(synopsis "JSON parser and printer library for C++")