WIP: nongnu: firefox: Update to 100.

1 files changed, 36 insertions, 6 deletions

diff --git a/nongnu/packages/mozilla.scm b/nongnu/packages/mozilla.scm
index f888b12..f2ffa94 100644
--- a/nongnu/packages/mozilla.scm
+++ b/nongnu/packages/mozilla.scm
@@ -45,6 +45,7 @@
   #:use-module (guix gexp)
   #:use-module (guix packages)
   #:use-module (guix utils)
+  #:use-module ((guix build utils) #:select (alist-replace))
 
   #:use-module (gnu packages)
   #:use-module (gnu packages assembly)
@@ -84,21 +85,50 @@
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg))
 
+(define* (rust-uri version #:key (dist "static"))
+  (string-append "https://" dist ".rust-lang.org/dist/"
+                 "rustc-" version "-src.tar.gz"))
+
+(define* (rust-bootstrapped-package base-rust version checksum)
+  "Bootstrap rust VERSION with source checksum CHECKSUM using BASE-RUST."
+  (package
+    (inherit base-rust)
+    (version version)
+    (source
+     (origin
+       (inherit (package-source base-rust))
+       (uri (rust-uri version))
+       (sha256 (base32 checksum))))
+    (native-inputs
+     (alist-replace "cargo-bootstrap" (list base-rust "cargo")
+                    (alist-replace "rustc-bootstrap" (list base-rust)
+                                   (package-native-inputs base-rust))))))
+
+(define rust-firefox-1.58
+  (rust-bootstrapped-package
+   rust "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"))
+
+(define rust-firefox-1.59
+  (rust-bootstrapped-package
+   rust-firefox-1.58 "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57"))
+
+(define-public rust-firefox rust-firefox-1.59)
+
 ;; 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 "20220520000000")
+(define %firefox-build-id "20220531000000")
 
 (define-public firefox
   (package
     (name "firefox")
-    (version "100.0.2")
+    (version "101.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 "05w499jjsi8n04zwwr5vskriddafd6dghyhlizykhsag41hrh46w"))))
+        (base32 "15b0p2zwpln46x2ya27mv6izpw8w6yl660k46z4cpfsqgm8mpasm"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -223,7 +253,7 @@
                                                 "/bin/autoconf"))
               (setenv "SHELL" (which "bash"))
               (setenv "CONFIG_SHELL" (which "bash"))
-              (setenv "MACH_USE_SYSTEM_PYTHON" "1")
+              (setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system")
 
               ;; Use Clang, Clang is 2x faster than GCC
               (setenv "AR" "llvm-ar")
@@ -403,7 +433,7 @@
       (list
         alsa-lib
         autoconf-2.13
-        `(,rust "cargo")
+        `(,rust-firefox "cargo")
         clang-12
         llvm-12
         wasm32-wasi-clang-toolchain
@@ -413,7 +443,7 @@
         perl
         pkg-config
         python
-        rust
+        rust-firefox
         rust-cbindgen-0.19
         which
         yasm))