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

gnu: json-modern-cxx: Update to 3.9.1.

Browse source 
* 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:
Tobias Geerinckx-Rice 2020-08-10 00:37:14 +02:00
parent 6376cb34b1
commit 7b403575fa
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/cpp.scm
View file

@ -247,7 +247,7 @@ (define-public fifo-map
(define-public json-modern-cxx (define-public json-modern-cxx
(package (package
(name "json-modern-cxx") (name "json-modern-cxx")
(version "3.9.0") (version "3.9.1")
(home-page "https://github.com/nlohmann/json") (home-page "https://github.com/nlohmann/json")
(source (source
(origin (origin
@ -255,8 +255,7 @@ (define-public json-modern-cxx
(uri (git-reference (url home-page) (uri (git-reference (url home-page)
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32 "0ar4mzp53lskxw3vdzw07f47njcshl3lwid9jfq6l7yx6ds2nyjc"))
"06wmbnwbisbq3rqdbmi297hidvq6q8vs6j4z0a9qpr4sm721lwa6"))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
@ -285,17 +284,6 @@ (define-public json-modern-cxx
(list (string-append "-DJSON_TestDataDirectory=" (list (string-append "-DJSON_TestDataDirectory="
(assoc-ref %build-inputs "json_test_data"))) (assoc-ref %build-inputs "json_test_data")))
#:phases (modify-phases %standard-phases #: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 ;; XXX: When tests are enabled, the install phase will cause
;; a needless rebuild without the given configure flags, ;; a needless rebuild without the given configure flags,
;; ultimately creating both $out/lib and $out/lib64. Move ;; ultimately creating both $out/lib and $out/lib64. Move