mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-05 10:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: jsoncpp: Apply patch to regular package.

Browse source 
* gnu/packages/serialization.scm (jsoncpp)[source]: Apply patch.
(jsoncpp-with-pkg-version): Delete variant package.
* gnu/packages/jami.scm (libring)[inputs]: Adjust accordingly.
This commit is contained in:
Maxim Cournoyer 2021-10-21 20:24:51 -04:00
parent 8f78f61c02
commit df20439d44
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/jami.scm
View file

@ -422,7 +422,7 @@
("eudev" ,eudev) ("eudev" ,eudev)
("ffmpeg" ,ffmpeg-jami) ("ffmpeg" ,ffmpeg-jami)
("jack" ,jack-1) ("jack" ,jack-1)
("jsoncpp" ,jsoncpp-with-pkg-version) ("jsoncpp" ,jsoncpp)
("libarchive" ,libarchive) ("libarchive" ,libarchive)
("libgit2" ,libgit2) ("libgit2" ,libgit2)
("libnatpmp" ,libnatpmp) ("libnatpmp" ,libnatpmp)

21
gnu/packages/serialization.scm
View file

@ -425,6 +425,8 @@ in which the loaded data is arranged in memory.")
(method git-fetch) (method git-fetch)
(uri (git-reference (url home-page) (commit version))) (uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(patches
(search-patches "jsoncpp-pkg-config-version.patch"))
(sha256 (sha256
(base32 (base32
"0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv")))) "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"))))
@ -444,25 +446,6 @@ preserve existing comment in unserialization/serialization steps, making
it a convenient format to store user input files.") it a convenient format to store user input files.")
(license license:expat))) (license license:expat)))
;; XXX: TODO(core-updates): Remove this package and apply the patch to the
;; jsoncpp package. This patch fixes the package version declared in the
;; pkg-config file.
(define-public jsoncpp-with-pkg-version
(package
(inherit jsoncpp)
(name "jsoncpp")
(version "1.9.4")
(home-page "https://github.com/open-source-parsers/jsoncpp")
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"))
(patches
(search-patches "jsoncpp-pkg-config-version.patch"))))))
;; Tensorflow does not build with jsoncpp 1.8.x. It is built with commit ;; Tensorflow does not build with jsoncpp 1.8.x. It is built with commit
;; 4356d9bba191e1e16ce7a92073cbf3e63564e973, which lies between version 1.7.2 ;; 4356d9bba191e1e16ce7a92073cbf3e63564e973, which lies between version 1.7.2
;; and 1.7.3. ;; and 1.7.3.