nongnu: rust-cbindgen-0.14.3: Rename and update it.

We do not want to interfere with upstreams rust-cbindgen for Icecat ESR.

* nongnu/packages/mozilla.scm (rust-cbindgen-0.14.3): Rename to
rust-cbindgen-firefox. Update to 0.15.0. Add comment why it's a
private variable.
(firefox)[native-inputs]: Adjust accordingly.
This commit is contained in:
Jonathan Brielmaier 2020-11-17 20:16:30 +01:00
parent 6e2b89efd4
commit f8e9e26861
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F

View file

@ -76,11 +76,13 @@
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
(define rust-cbindgen-0.14.3 ;; Keep it private as we need it only for firefox. Upstream uses an older
;; version for ESR based Icecat and Icedove. So we don't wanna mix them.
(define rust-cbindgen-firefox
(package (package
(inherit rust-cbindgen-0.14) (inherit rust-cbindgen-0.14)
(name "rust-cbindgen") (name "rust-cbindgen")
(version "0.14.3") (version "0.15.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -89,7 +91,7 @@
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0n88s072g09sfnvsbbkfw0mgga15isj09wc6ak63brzjbmq3mq76")))) "0dgf49zij9rxnf0lv4k5gcmx1mxcz16czkk6q63anz0xp8ds3xhx"))))
(arguments (arguments
;; Cannot build with rust-1.39 ;; Cannot build with rust-1.39
(cons* #:rust rust-1.43 (cons* #:rust rust-1.43
@ -406,7 +408,7 @@
("python" ,python) ("python" ,python)
("python2" ,python-2.7) ("python2" ,python-2.7)
("rust" ,rust-1.43) ("rust" ,rust-1.43)
("rust-cbindgen" ,rust-cbindgen-0.14.3) ("rust-cbindgen" ,rust-cbindgen-firefox)
("which" ,which) ("which" ,which)
("yasm" ,yasm))) ("yasm" ,yasm)))
(home-page "https://mozilla.org/firefox/") (home-page "https://mozilla.org/firefox/")