mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-28 23:32:24 -05:00
gnu: json-modern-cxx: Update to 3.9.1.
* gnu/packages/cpp.scm (json-modern-cxx): Update to 3.9.1. [arguments]: Remove obsolete ‘fix-pkg-config-install’ phase.
This commit is contained in:
parent
6376cb34b1
commit
7b403575fa
1 changed files with 2 additions and 14 deletions
|
@ -247,7 +247,7 @@ (define-public fifo-map
|
|||
(define-public json-modern-cxx
|
||||
(package
|
||||
(name "json-modern-cxx")
|
||||
(version "3.9.0")
|
||||
(version "3.9.1")
|
||||
(home-page "https://github.com/nlohmann/json")
|
||||
(source
|
||||
(origin
|
||||
|
@ -255,8 +255,7 @@ (define-public json-modern-cxx
|
|||
(uri (git-reference (url home-page)
|
||||
(commit (string-append "v" version))))
|
||||
(sha256
|
||||
(base32
|
||||
"06wmbnwbisbq3rqdbmi297hidvq6q8vs6j4z0a9qpr4sm721lwa6"))
|
||||
(base32 "0ar4mzp53lskxw3vdzw07f47njcshl3lwid9jfq6l7yx6ds2nyjc"))
|
||||
(file-name (git-file-name name version))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -285,17 +284,6 @@ (define-public json-modern-cxx
|
|||
(list (string-append "-DJSON_TestDataDirectory="
|
||||
(assoc-ref %build-inputs "json_test_data")))
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-pkg-config-install
|
||||
(lambda _
|
||||
;; This phase can be removed for versions >= 3.9.1.
|
||||
(substitute* "CMakeLists.txt"
|
||||
;; Look for the generated .pc in the right place ...
|
||||
(("\\$\\{CMAKE_BINARY_DIR\\}/\\$\\{PROJECT_NAME\\}\\.pc")
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc")
|
||||
;; ... and install it to the libdir.
|
||||
(("DESTINATION lib/pkgconfig")
|
||||
"DESTINATION \"${CMAKE_INSTALL_LIBDIR}/pkgconfig\""))
|
||||
#t))
|
||||
;; XXX: When tests are enabled, the install phase will cause
|
||||
;; a needless rebuild without the given configure flags,
|
||||
;; ultimately creating both $out/lib and $out/lib64. Move
|
||||
|
|
Loading…
Reference in a new issue