Lispln/nonguix
1
0
Fork 0
mirror of https://gitlab.com/nonguix/nonguix.git synced 2024-11-26 18:35:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

nongnu: firefox: Update to upstream rust components.

Browse source 
* nongnu/packages/mozilla.scm (rust-cbindgen-firefox): Remove.
(firefox)[native-inputs]: Replace rust-1.43 with rust (1.45).
Replace rust-cbindgen-firefox with rust-cbindgen-0.15.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Zhu Zihao 2021-01-04 23:33:47 +08:00 committed by Jonathan Brielmaier
parent e25426835e
commit 084281754a
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F
1 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
nongnu/packages/mozilla.scm
View file

@ -76,30 +76,6 @@
#:use-module (gnu packages xdisorg) #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
;; 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
(inherit rust-cbindgen-0.14)
(name "rust-cbindgen")
(version "0.15.0")
(source
(origin
(method url-fetch)
(uri (crate-uri "cbindgen" version))
(file-name
(string-append name "-" version ".tar.gz"))
(sha256
(base32
"0dgf49zij9rxnf0lv4k5gcmx1mxcz16czkk6q63anz0xp8ds3xhx"))))
(arguments
;; Cannot build with rust-1.39
(cons* #:rust rust-1.43
(substitute-keyword-arguments (package-arguments rust-cbindgen-0.14)
((#:cargo-inputs cargo-inputs)
`(("rust-heck" ,rust-heck-0.3)
,@cargo-inputs)))))))
;; Update this id with every firefox update to it's release date. ;; Update this id with every firefox update to it's release date.
;; It's used for cache validation and therefor can lead to strange bugs. ;; It's used for cache validation and therefor can lead to strange bugs.
(define %firefox-build-id "20201222000000") (define %firefox-build-id "20201222000000")
@ -392,7 +368,7 @@
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("autoconf" ,autoconf-2.13) `(("autoconf" ,autoconf-2.13)
("cargo" ,rust-1.43 "cargo") ("cargo" ,rust "cargo")
("clang" ,clang) ("clang" ,clang)
("llvm" ,llvm) ("llvm" ,llvm)
("m4" ,m4) ("m4" ,m4)
@ -402,8 +378,8 @@
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python) ("python" ,python)
("python2" ,python-2.7) ("python2" ,python-2.7)
("rust" ,rust-1.43) ("rust" ,rust)
("rust-cbindgen" ,rust-cbindgen-firefox) ("rust-cbindgen" ,rust-cbindgen-0.15)
("which" ,which) ("which" ,which)
("yasm" ,yasm))) ("yasm" ,yasm)))
(home-page "https://mozilla.org/firefox/") (home-page "https://mozilla.org/firefox/")