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

nongnu: firefox: Update to 93.0.

Browse source 
* nongnu/packages/mozilla.scm (firefox): Update to 93.0.
[arguments]: Add 'remove-cargo-frozen-flag phase.  Unset PYTHON variable
in 'configure phase.  Set MOZBUILD_STATE_PATH variable in 'configure
phase.
[native-inputs]: Remove python-2.
(%firefox-build-id): Increment.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Pierre Langlois 2021-10-18 19:45:20 +01:00 committed by Jonathan Brielmaier
parent 904e05f136
commit fcab975d18
No known key found for this signature in database
GPG key ID: ECFC83988B4E4B9F
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
nongnu/packages/mozilla.scm
View file

@ -83,19 +83,19 @@
;; 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 "20210923000000") (define %firefox-build-id "20211017000000")
(define-public firefox (define-public firefox
(package (package
(name "firefox") (name "firefox")
(version "92.0.1") (version "93.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/" (uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
version "/source/firefox-" version ".source.tar.xz")) version "/source/firefox-" version ".source.tar.xz"))
(sha256 (sha256
(base32 "1c9yc3mfihzj00q9xf52xd65j6m74wv8zvsy1l49klic2qpb55lh")))) (base32 "00kiz6hnwmz659cqndpalxhyj4jajd03b7r9hi5jig29b07hi3x7"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -204,7 +204,15 @@
"third_party/rust" "third_party/rust"
"toolkit" "toolkit"
"xpcom/rust" "xpcom/rust"
"services"))) "services"))
#t)))
(add-after 'patch-cargo-checksums 'remove-cargo-frozen-flag
(lambda _
;; Remove --frozen flag from cargo invokation, otherwise it'll
;; complain that it's not able to change Cargo.lock.
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373
(substitute* "build/RunCbindgen.py"
(("\"--frozen\",") ""))
#t)) #t))
(delete 'bootstrap) (delete 'bootstrap)
(replace 'configure (replace 'configure
@ -213,8 +221,6 @@
"/bin/autoconf")) "/bin/autoconf"))
(setenv "SHELL" (which "bash")) (setenv "SHELL" (which "bash"))
(setenv "CONFIG_SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash"))
(setenv "PYTHON" (string-append (assoc-ref inputs "python2")
"/bin/python"))
(setenv "MACH_USE_SYSTEM_PYTHON" "1") (setenv "MACH_USE_SYSTEM_PYTHON" "1")
;; Use Clang, Clang is 2x faster than GCC ;; Use Clang, Clang is 2x faster than GCC
@ -228,6 +234,8 @@
;; reproducibility, so change it to a fixed date. ;; reproducibility, so change it to a fixed date.
(setenv "MOZ_BUILD_DATE" ,%firefox-build-id) (setenv "MOZ_BUILD_DATE" ,%firefox-build-id)
(setenv "MOZBUILD_STATE_PATH" (getcwd))
(let* ((mozconfig (string-append (getcwd) "/mozconfig")) (let* ((mozconfig (string-append (getcwd) "/mozconfig"))
(out (assoc-ref outputs "out")) (out (assoc-ref outputs "out"))
(flags (cons (string-append "--prefix=" out) (flags (cons (string-append "--prefix=" out)
@ -392,7 +400,6 @@
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python) ("python" ,python)
("python2" ,python-2.7)
("rust" ,rust-1.51) ("rust" ,rust-1.51)
("rust-cbindgen" ,rust-cbindgen-0.19) ("rust-cbindgen" ,rust-cbindgen-0.19)
("which" ,which) ("which" ,which)