summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Langlois <pierre.langlois@gmx.com>2021-10-18 19:45:20 +0100
committerJonathan Brielmaier <jonathan.brielmaier@web.de>2021-10-18 20:32:21 +0000
commitfcab975d18c42be847d3b8cd907e20bfda7f551e (patch)
treee39490d4b63d9e3030b4bb4ba4ce3bb855745448
parent904e05f1365cc8ebf7be2b59263f430d373df0ef (diff)
nongnu: firefox: Update to 93.0.
* 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>
-rw-r--r--nongnu/packages/mozilla.scm21
1 files changed, 14 insertions, 7 deletions
diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm
index 0d0f402..6d090f1 100644
--- a/nongnu/packages/mozilla.scm
+++ b/nongnu/packages/mozilla.scm
@@ -83,19 +83,19 @@
;; 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.
-(define %firefox-build-id "20210923000000")
+(define %firefox-build-id "20211017000000")
(define-public firefox
(package
(name "firefox")
- (version "92.0.1")
+ (version "93.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
version "/source/firefox-" version ".source.tar.xz"))
(sha256
- (base32 "1c9yc3mfihzj00q9xf52xd65j6m74wv8zvsy1l49klic2qpb55lh"))))
+ (base32 "00kiz6hnwmz659cqndpalxhyj4jajd03b7r9hi5jig29b07hi3x7"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
@@ -204,7 +204,15 @@
"third_party/rust"
"toolkit"
"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))
(delete 'bootstrap)
(replace 'configure
@@ -213,8 +221,6 @@
"/bin/autoconf"))
(setenv "SHELL" (which "bash"))
(setenv "CONFIG_SHELL" (which "bash"))
- (setenv "PYTHON" (string-append (assoc-ref inputs "python2")
- "/bin/python"))
(setenv "MACH_USE_SYSTEM_PYTHON" "1")
;; Use Clang, Clang is 2x faster than GCC
@@ -228,6 +234,8 @@
;; reproducibility, so change it to a fixed date.
(setenv "MOZ_BUILD_DATE" ,%firefox-build-id)
+ (setenv "MOZBUILD_STATE_PATH" (getcwd))
+
(let* ((mozconfig (string-append (getcwd) "/mozconfig"))
(out (assoc-ref outputs "out"))
(flags (cons (string-append "--prefix=" out)
@@ -392,7 +400,6 @@
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python)
- ("python2" ,python-2.7)
("rust" ,rust-1.51)
("rust-cbindgen" ,rust-cbindgen-0.19)
("which" ,which)