2020-07-20 09:04:53 +02:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
|
|
|
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
|
|
|
|
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
|
|
|
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver <mhw@netris.org>
|
|
|
|
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
|
|
|
;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
|
|
|
|
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
|
|
|
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
|
|
|
;;; Copyright © 2017, 2018 Nikita <nikita@n0.is>
|
2021-12-14 16:40:30 +01:00
|
|
|
;;; Copyright © 2017, 2018 ng0 <gillmann@infotropique.org>
|
2020-07-20 09:04:53 +02:00
|
|
|
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
2022-02-13 18:04:22 +01:00
|
|
|
;;; Copyright © 2018, 2020, 2022 Ricardo Wurmus <rekado@elephly.net>
|
2020-07-20 09:04:53 +02:00
|
|
|
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
|
|
|
|
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
|
|
|
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
|
|
|
;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
|
nongnu: firefox: Update to 96.0 [security fixes].
Fixes CVE-2022-22746, CVE-2022-22743, CVE-2022-22742, CVE-2022-22741,
CVE-2022-22740, CVE-2022-22738, CVE-2022-22737, CVE-2021-4140,
CVE-2022-22750, CVE-2022-22749, CVE-2022-22748, CVE-2022-22745,
CVE-2022-22744, CVE-2022-22747, CVE-2022-22736, CVE-2022-22739,
CVE-2022-22751 and CVE-2022-22752.
* nongnu/packages/mozilla.scm (firefox): Update to 96.0.
[inputs]: Use `icu4c-70`.
2022-01-15 20:31:05 +01:00
|
|
|
;;; Copyright © 2020-2022 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
2020-07-20 09:04:53 +02:00
|
|
|
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
|
2021-04-29 15:55:31 +02:00
|
|
|
;;; Copyright © 2021 pineapples <guixuser6392@protonmail.com>
|
2021-06-12 22:01:29 +02:00
|
|
|
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
gnu: Add rust-cbindgen-0.23 and rust-cbindgen-0.24.
* nongnu/packages/mozilla.scm (rust-unicode-ident-1, rust-proc-macro2-1.0.43,
rust-syn-1.0.99, rust-textwrap-0.15, rust-windows-x86-64-msvc-0.36,
rust-windows-x86-64-gnu-0.36, rust-windows-i686-msvc-0.36,
rust-windows-i686-gnu-0.36, rust-windows-aarch64-msvc-0.36,
rust-windows-sys-0.36, rust-hashbrown-0.12, rust-object-0.29,
rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17, rust-backtrace-0.3.66,
rust-parking-lot-core-0.9, rust-once-cell-1.13.0, rust-clap-lex-0.2,
rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24,
rust-cbindgen-0.23): New variables.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-08-10 05:30:44 +02:00
|
|
|
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
|
2022-01-17 19:54:50 +01:00
|
|
|
;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
|
2020-07-20 09:04:53 +02:00
|
|
|
;;;
|
|
|
|
;;; This file is not part of GNU Guix.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
;;; your option) any later version.
|
|
|
|
;;;
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
;;;
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
(define-module (nongnu packages mozilla)
|
|
|
|
#:use-module (guix build-system gnu)
|
|
|
|
#:use-module (guix build-system cargo)
|
2021-04-29 15:55:31 +02:00
|
|
|
#:use-module (guix build-system trivial)
|
2020-07-20 09:04:53 +02:00
|
|
|
#:use-module (guix download)
|
|
|
|
#:use-module ((guix licenses) #:prefix license:)
|
2022-02-13 18:04:22 +01:00
|
|
|
#:use-module (guix gexp)
|
2020-07-20 09:04:53 +02:00
|
|
|
#:use-module (guix packages)
|
2020-09-13 12:43:52 +02:00
|
|
|
#:use-module (guix utils)
|
2022-08-13 19:44:40 +02:00
|
|
|
#:use-module ((guix build utils) #:select (alist-replace))
|
2020-07-20 09:04:53 +02:00
|
|
|
|
|
|
|
#:use-module (gnu packages)
|
|
|
|
#:use-module (gnu packages assembly)
|
|
|
|
#:use-module (gnu packages autotools)
|
|
|
|
#:use-module (gnu packages base)
|
2021-04-29 15:55:31 +02:00
|
|
|
#:use-module (gnu packages bash)
|
2020-07-20 09:04:53 +02:00
|
|
|
#:use-module (gnu packages compression)
|
2020-09-13 12:39:15 +02:00
|
|
|
#:use-module (gnu packages crates-io)
|
2020-07-20 09:04:53 +02:00
|
|
|
#:use-module (gnu packages cups)
|
|
|
|
#:use-module (gnu packages fontutils)
|
|
|
|
#:use-module (gnu packages gl)
|
|
|
|
#:use-module (gnu packages glib)
|
|
|
|
#:use-module (gnu packages gnome)
|
|
|
|
#:use-module (gnu packages gtk)
|
|
|
|
#:use-module (gnu packages icu4c)
|
|
|
|
#:use-module (gnu packages image)
|
|
|
|
#:use-module (gnu packages jemalloc)
|
|
|
|
#:use-module (gnu packages kerberos)
|
|
|
|
#:use-module (gnu packages libcanberra)
|
|
|
|
#:use-module (gnu packages libevent)
|
|
|
|
#:use-module (gnu packages libffi)
|
|
|
|
#:use-module (gnu packages libreoffice) ;for hunspell
|
2021-06-12 22:01:29 +02:00
|
|
|
#:use-module (gnu packages linux)
|
2020-07-20 09:04:53 +02:00
|
|
|
#:use-module (gnu packages llvm)
|
2020-10-21 12:39:10 +02:00
|
|
|
#:use-module (gnu packages m4)
|
2020-07-20 09:04:53 +02:00
|
|
|
#:use-module (gnu packages node)
|
|
|
|
#:use-module (gnu packages nss)
|
|
|
|
#:use-module (gnu packages perl)
|
|
|
|
#:use-module (gnu packages pkg-config)
|
|
|
|
#:use-module (gnu packages pulseaudio)
|
|
|
|
#:use-module (gnu packages python)
|
|
|
|
#:use-module (gnu packages rust)
|
|
|
|
#:use-module (gnu packages rust-apps)
|
|
|
|
#:use-module (gnu packages sqlite)
|
|
|
|
#:use-module (gnu packages video)
|
2022-01-17 19:54:50 +01:00
|
|
|
#:use-module (nongnu packages wasm)
|
2020-07-20 09:04:53 +02:00
|
|
|
#:use-module (gnu packages xdisorg)
|
|
|
|
#:use-module (gnu packages xorg))
|
|
|
|
|
2022-08-13 19:44:40 +02:00
|
|
|
;; Copied from guix/gnu/packages/rust.scm
|
|
|
|
(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))))))
|
|
|
|
|
2022-09-22 22:52:58 +02:00
|
|
|
(define rust-firefox-1.61
|
|
|
|
(let ((base-rust (rust-bootstrapped-package
|
2022-10-16 00:56:41 +02:00
|
|
|
rust "1.61.0"
|
2022-09-22 22:52:58 +02:00
|
|
|
"1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd")))
|
|
|
|
(package
|
|
|
|
(inherit base-rust)
|
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments base-rust)
|
|
|
|
((#:phases phases)
|
|
|
|
`(modify-phases ,phases
|
|
|
|
(add-after 'unpack 'disable-tests-with-sigint
|
|
|
|
;; These tests rely on killing a process with SIGINT which
|
|
|
|
;; fails in the build container.
|
|
|
|
(lambda _
|
|
|
|
(substitute* "library/std/src/sys/unix/process/process_common/tests.rs"
|
|
|
|
(("fn test_process_group_posix_spawn")
|
|
|
|
"#[ignore]\nfn test_process_group_posix_spawn")
|
|
|
|
(("fn test_process_group_no_posix_spawn")
|
|
|
|
"#[ignore]\nfn test_process_group_no_posix_spawn")))))))))))
|
|
|
|
|
2022-09-22 22:50:11 +02:00
|
|
|
;; Define the versions of rust needed to build firefox, trying to match
|
|
|
|
;; upstream. See the file taskcluster/ci/toolchain/rust.yml at
|
|
|
|
;; https://searchfox.org under the particular firefox release, like
|
|
|
|
;; mozilla-esr102.
|
2022-10-16 00:56:41 +02:00
|
|
|
(define-public rust-firefox-esr rust) ; 1.60 is the default in Guix
|
2022-09-22 22:52:58 +02:00
|
|
|
(define-public rust-firefox rust-firefox-1.61) ; 1.63 is also listed, but 1.61 is the minimum needed
|
2022-08-13 19:44:40 +02:00
|
|
|
|
gnu: Add rust-cbindgen-0.23 and rust-cbindgen-0.24.
* nongnu/packages/mozilla.scm (rust-unicode-ident-1, rust-proc-macro2-1.0.43,
rust-syn-1.0.99, rust-textwrap-0.15, rust-windows-x86-64-msvc-0.36,
rust-windows-x86-64-gnu-0.36, rust-windows-i686-msvc-0.36,
rust-windows-i686-gnu-0.36, rust-windows-aarch64-msvc-0.36,
rust-windows-sys-0.36, rust-hashbrown-0.12, rust-object-0.29,
rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17, rust-backtrace-0.3.66,
rust-parking-lot-core-0.9, rust-once-cell-1.13.0, rust-clap-lex-0.2,
rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24,
rust-cbindgen-0.23): New variables.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-08-10 05:30:44 +02:00
|
|
|
;; rust-cbindgen-0.23/0.24 dependencies
|
|
|
|
(define-public rust-unicode-ident-1
|
|
|
|
(package
|
|
|
|
(name "rust-unicode-ident")
|
|
|
|
(version "1.0.3")
|
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (crate-uri "unicode-ident" version))
|
|
|
|
(file-name (string-append name "-" version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"1bqswc96ws8l6k7xx56dg521a3l5imi3mhlcz7rsi6a92mxb7xf4"))))
|
|
|
|
(build-system cargo-build-system)
|
|
|
|
(arguments
|
|
|
|
`(#:skip-build? #t))
|
|
|
|
(home-page "https://github.com/dtolnay/unicode-ident")
|
|
|
|
(synopsis
|
|
|
|
"Better optimized implementation of the older unicode-xid crate")
|
|
|
|
(description
|
|
|
|
"Determine whether characters have the XID_Start or XID_Continue properties
|
|
|
|
according to Unicode Standard Annex #31")
|
|
|
|
(license (list license:unicode license:expat))))
|
|
|
|
|
|
|
|
(define-public rust-textwrap-0.15
|
|
|
|
(package
|
|
|
|
(inherit rust-textwrap-0.12)
|
|
|
|
(name "rust-textwrap")
|
|
|
|
(version "0.15.0")
|
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (crate-uri "textwrap" version))
|
|
|
|
(file-name (string-append name "-" version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"1yw513k61lfiwgqrfvsjw1a5wpvm0azhpjr2kr0jhnq9c56is55i"))))
|
|
|
|
(arguments
|
|
|
|
`(#:skip-build? #t
|
|
|
|
#:cargo-inputs (("rust-hyphenation" ,rust-hyphenation-0.8)
|
|
|
|
("rust-smawk" ,rust-smawk-0.3)
|
|
|
|
("rust-terminal-size" ,rust-terminal-size-0.1)
|
|
|
|
("rust-unicode-linebreak" ,rust-unicode-linebreak-0.1)
|
|
|
|
("rust-unicode-width" ,rust-unicode-width-0.1))))))
|
|
|
|
|
|
|
|
(define-public rust-clap-lex-0.2
|
|
|
|
(package
|
|
|
|
(name "rust-clap-lex")
|
|
|
|
(version "0.2.4")
|
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (crate-uri "clap_lex" version))
|
|
|
|
(file-name (string-append name "-" version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"))))
|
|
|
|
(build-system cargo-build-system)
|
|
|
|
(arguments
|
|
|
|
`(#:skip-build? #t
|
|
|
|
#:cargo-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-6))))
|
|
|
|
(home-page "https://github.com/clap-rs/clap/tree/master/clap_lex")
|
|
|
|
(synopsis "Minimal, flexible command line parser")
|
|
|
|
(description "Minimal, flexible command line parser")
|
|
|
|
(license (list license:expat license:asl2.0))))
|
|
|
|
|
|
|
|
(define-public rust-clap-derive-3.2.15
|
|
|
|
(package
|
|
|
|
(inherit rust-clap-derive-3)
|
|
|
|
(name "rust-clap-derive")
|
|
|
|
(version "3.2.15")
|
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (crate-uri "clap_derive" version))
|
|
|
|
(file-name (string-append name "-" version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"1d2c4vs345fwihkd8cc7m6acbiydcwramkd5mnp36p0a7g6jm9cv"))))
|
|
|
|
(arguments
|
|
|
|
`(#:skip-build? #t
|
|
|
|
#:cargo-inputs (("rust-heck" ,rust-heck-0.4)
|
|
|
|
("rust-proc-macro-error" ,rust-proc-macro-error-1)
|
nongnu: Remove unneeded packages from mozilla.scm.
* nongnu/packages/mozilla.scm (rust-proc-macro2-1.0.43, rust-syn-1.0.99,
rust-windows-x86-64-msvc-0.36, rust-windows-x86-64-gnu-0.36,
rust-windows-i686-msvc-0.36, rust-windows-i686-gnu-0.36,
rust-windows-aarch64-msvc-0.36, rust-windows-sys-0.36, rust-hashbrown-0.12,
rust-object-0.29, rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17,
rust-backtrace-0.3.66, rust-parking-lot-core-0.9, rust-once-cell-1.13.0):
Remove variables (added to upstream Guix).
(rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24)[cargo-inputs]:
Adjust to upstream package names.
2022-09-12 02:03:39 +02:00
|
|
|
("rust-proc-macro2" ,rust-proc-macro2-1)
|
gnu: Add rust-cbindgen-0.23 and rust-cbindgen-0.24.
* nongnu/packages/mozilla.scm (rust-unicode-ident-1, rust-proc-macro2-1.0.43,
rust-syn-1.0.99, rust-textwrap-0.15, rust-windows-x86-64-msvc-0.36,
rust-windows-x86-64-gnu-0.36, rust-windows-i686-msvc-0.36,
rust-windows-i686-gnu-0.36, rust-windows-aarch64-msvc-0.36,
rust-windows-sys-0.36, rust-hashbrown-0.12, rust-object-0.29,
rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17, rust-backtrace-0.3.66,
rust-parking-lot-core-0.9, rust-once-cell-1.13.0, rust-clap-lex-0.2,
rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24,
rust-cbindgen-0.23): New variables.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-08-10 05:30:44 +02:00
|
|
|
("rust-quote" ,rust-quote-1)
|
nongnu: Remove unneeded packages from mozilla.scm.
* nongnu/packages/mozilla.scm (rust-proc-macro2-1.0.43, rust-syn-1.0.99,
rust-windows-x86-64-msvc-0.36, rust-windows-x86-64-gnu-0.36,
rust-windows-i686-msvc-0.36, rust-windows-i686-gnu-0.36,
rust-windows-aarch64-msvc-0.36, rust-windows-sys-0.36, rust-hashbrown-0.12,
rust-object-0.29, rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17,
rust-backtrace-0.3.66, rust-parking-lot-core-0.9, rust-once-cell-1.13.0):
Remove variables (added to upstream Guix).
(rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24)[cargo-inputs]:
Adjust to upstream package names.
2022-09-12 02:03:39 +02:00
|
|
|
("rust-syn" ,rust-syn-1))))))
|
gnu: Add rust-cbindgen-0.23 and rust-cbindgen-0.24.
* nongnu/packages/mozilla.scm (rust-unicode-ident-1, rust-proc-macro2-1.0.43,
rust-syn-1.0.99, rust-textwrap-0.15, rust-windows-x86-64-msvc-0.36,
rust-windows-x86-64-gnu-0.36, rust-windows-i686-msvc-0.36,
rust-windows-i686-gnu-0.36, rust-windows-aarch64-msvc-0.36,
rust-windows-sys-0.36, rust-hashbrown-0.12, rust-object-0.29,
rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17, rust-backtrace-0.3.66,
rust-parking-lot-core-0.9, rust-once-cell-1.13.0, rust-clap-lex-0.2,
rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24,
rust-cbindgen-0.23): New variables.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-08-10 05:30:44 +02:00
|
|
|
|
|
|
|
(define-public rust-clap-3.2.16
|
|
|
|
(package
|
|
|
|
(inherit rust-clap-3)
|
|
|
|
(name "rust-clap")
|
|
|
|
(version "3.2.16")
|
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (crate-uri "clap" version))
|
|
|
|
(file-name (string-append name "-" version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"1af06z8z7m3327yz1xvzxfjanclgpvvy3lssb745rig7adkbpnx3"))))
|
|
|
|
(arguments
|
|
|
|
`(#:skip-build? #t
|
|
|
|
#:cargo-inputs (("rust-atty" ,rust-atty-0.2)
|
nongnu: Remove unneeded packages from mozilla.scm.
* nongnu/packages/mozilla.scm (rust-proc-macro2-1.0.43, rust-syn-1.0.99,
rust-windows-x86-64-msvc-0.36, rust-windows-x86-64-gnu-0.36,
rust-windows-i686-msvc-0.36, rust-windows-i686-gnu-0.36,
rust-windows-aarch64-msvc-0.36, rust-windows-sys-0.36, rust-hashbrown-0.12,
rust-object-0.29, rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17,
rust-backtrace-0.3.66, rust-parking-lot-core-0.9, rust-once-cell-1.13.0):
Remove variables (added to upstream Guix).
(rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24)[cargo-inputs]:
Adjust to upstream package names.
2022-09-12 02:03:39 +02:00
|
|
|
("rust-backtrace" ,rust-backtrace-0.3)
|
gnu: Add rust-cbindgen-0.23 and rust-cbindgen-0.24.
* nongnu/packages/mozilla.scm (rust-unicode-ident-1, rust-proc-macro2-1.0.43,
rust-syn-1.0.99, rust-textwrap-0.15, rust-windows-x86-64-msvc-0.36,
rust-windows-x86-64-gnu-0.36, rust-windows-i686-msvc-0.36,
rust-windows-i686-gnu-0.36, rust-windows-aarch64-msvc-0.36,
rust-windows-sys-0.36, rust-hashbrown-0.12, rust-object-0.29,
rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17, rust-backtrace-0.3.66,
rust-parking-lot-core-0.9, rust-once-cell-1.13.0, rust-clap-lex-0.2,
rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24,
rust-cbindgen-0.23): New variables.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-08-10 05:30:44 +02:00
|
|
|
("rust-bitflags" ,rust-bitflags-1)
|
|
|
|
("rust-clap-derive" ,rust-clap-derive-3.2.15)
|
|
|
|
("rust-clap-lex" ,rust-clap-lex-0.2)
|
|
|
|
("rust-indexmap" ,rust-indexmap-1)
|
nongnu: Remove unneeded packages from mozilla.scm.
* nongnu/packages/mozilla.scm (rust-proc-macro2-1.0.43, rust-syn-1.0.99,
rust-windows-x86-64-msvc-0.36, rust-windows-x86-64-gnu-0.36,
rust-windows-i686-msvc-0.36, rust-windows-i686-gnu-0.36,
rust-windows-aarch64-msvc-0.36, rust-windows-sys-0.36, rust-hashbrown-0.12,
rust-object-0.29, rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17,
rust-backtrace-0.3.66, rust-parking-lot-core-0.9, rust-once-cell-1.13.0):
Remove variables (added to upstream Guix).
(rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24)[cargo-inputs]:
Adjust to upstream package names.
2022-09-12 02:03:39 +02:00
|
|
|
("rust-once-cell" ,rust-once-cell-1)
|
gnu: Add rust-cbindgen-0.23 and rust-cbindgen-0.24.
* nongnu/packages/mozilla.scm (rust-unicode-ident-1, rust-proc-macro2-1.0.43,
rust-syn-1.0.99, rust-textwrap-0.15, rust-windows-x86-64-msvc-0.36,
rust-windows-x86-64-gnu-0.36, rust-windows-i686-msvc-0.36,
rust-windows-i686-gnu-0.36, rust-windows-aarch64-msvc-0.36,
rust-windows-sys-0.36, rust-hashbrown-0.12, rust-object-0.29,
rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17, rust-backtrace-0.3.66,
rust-parking-lot-core-0.9, rust-once-cell-1.13.0, rust-clap-lex-0.2,
rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24,
rust-cbindgen-0.23): New variables.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-08-10 05:30:44 +02:00
|
|
|
("rust-regex" ,rust-regex-1)
|
|
|
|
("rust-strsim" ,rust-strsim-0.10)
|
|
|
|
("rust-termcolor" ,rust-termcolor-1)
|
|
|
|
("rust-terminal-size" ,rust-terminal-size-0.1)
|
|
|
|
("rust-textwrap" ,rust-textwrap-0.15)
|
|
|
|
("rust-unicase" ,rust-unicase-2)
|
|
|
|
("rust-yaml-rust" ,rust-yaml-rust-0.4))))))
|
|
|
|
|
|
|
|
(define-public rust-cbindgen-0.24
|
|
|
|
(package
|
|
|
|
(inherit rust-cbindgen-0.19)
|
|
|
|
(name "rust-cbindgen")
|
|
|
|
(version "0.24.3")
|
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (crate-uri "cbindgen" version))
|
|
|
|
(file-name (string-append name "-" version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"1yqxqsz2d0cppd8zwihk2139g5gy38wqgl9snj6rnk8gyvnqsdd6"))))
|
|
|
|
(arguments
|
|
|
|
`(#:cargo-inputs (("rust-clap" ,rust-clap-3.2.16)
|
|
|
|
("rust-heck" ,rust-heck-0.4)
|
|
|
|
("rust-indexmap" ,rust-indexmap-1)
|
|
|
|
("rust-log" ,rust-log-0.4)
|
nongnu: Remove unneeded packages from mozilla.scm.
* nongnu/packages/mozilla.scm (rust-proc-macro2-1.0.43, rust-syn-1.0.99,
rust-windows-x86-64-msvc-0.36, rust-windows-x86-64-gnu-0.36,
rust-windows-i686-msvc-0.36, rust-windows-i686-gnu-0.36,
rust-windows-aarch64-msvc-0.36, rust-windows-sys-0.36, rust-hashbrown-0.12,
rust-object-0.29, rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17,
rust-backtrace-0.3.66, rust-parking-lot-core-0.9, rust-once-cell-1.13.0):
Remove variables (added to upstream Guix).
(rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24)[cargo-inputs]:
Adjust to upstream package names.
2022-09-12 02:03:39 +02:00
|
|
|
("rust-proc-macro2" ,rust-proc-macro2-1)
|
gnu: Add rust-cbindgen-0.23 and rust-cbindgen-0.24.
* nongnu/packages/mozilla.scm (rust-unicode-ident-1, rust-proc-macro2-1.0.43,
rust-syn-1.0.99, rust-textwrap-0.15, rust-windows-x86-64-msvc-0.36,
rust-windows-x86-64-gnu-0.36, rust-windows-i686-msvc-0.36,
rust-windows-i686-gnu-0.36, rust-windows-aarch64-msvc-0.36,
rust-windows-sys-0.36, rust-hashbrown-0.12, rust-object-0.29,
rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17, rust-backtrace-0.3.66,
rust-parking-lot-core-0.9, rust-once-cell-1.13.0, rust-clap-lex-0.2,
rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24,
rust-cbindgen-0.23): New variables.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-08-10 05:30:44 +02:00
|
|
|
("rust-quote" ,rust-quote-1)
|
|
|
|
("rust-serde" ,rust-serde-1)
|
|
|
|
("rust-serde-json" ,rust-serde-json-1)
|
nongnu: Remove unneeded packages from mozilla.scm.
* nongnu/packages/mozilla.scm (rust-proc-macro2-1.0.43, rust-syn-1.0.99,
rust-windows-x86-64-msvc-0.36, rust-windows-x86-64-gnu-0.36,
rust-windows-i686-msvc-0.36, rust-windows-i686-gnu-0.36,
rust-windows-aarch64-msvc-0.36, rust-windows-sys-0.36, rust-hashbrown-0.12,
rust-object-0.29, rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17,
rust-backtrace-0.3.66, rust-parking-lot-core-0.9, rust-once-cell-1.13.0):
Remove variables (added to upstream Guix).
(rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24)[cargo-inputs]:
Adjust to upstream package names.
2022-09-12 02:03:39 +02:00
|
|
|
("rust-syn" ,rust-syn-1)
|
gnu: Add rust-cbindgen-0.23 and rust-cbindgen-0.24.
* nongnu/packages/mozilla.scm (rust-unicode-ident-1, rust-proc-macro2-1.0.43,
rust-syn-1.0.99, rust-textwrap-0.15, rust-windows-x86-64-msvc-0.36,
rust-windows-x86-64-gnu-0.36, rust-windows-i686-msvc-0.36,
rust-windows-i686-gnu-0.36, rust-windows-aarch64-msvc-0.36,
rust-windows-sys-0.36, rust-hashbrown-0.12, rust-object-0.29,
rust-object-0.27, rust-gimli-0.26, rust-addr2line-0.17, rust-backtrace-0.3.66,
rust-parking-lot-core-0.9, rust-once-cell-1.13.0, rust-clap-lex-0.2,
rust-clap-derive-3.2.15, rust-clap-3.2.16, rust-cbindgen-0.24,
rust-cbindgen-0.23): New variables.
Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
2022-08-10 05:30:44 +02:00
|
|
|
("rust-tempfile" ,rust-tempfile-3)
|
|
|
|
("rust-toml" ,rust-toml-0.5))
|
|
|
|
#:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.5))))))
|
|
|
|
|
|
|
|
;; Bug with firefox build (v101-102) with cbindgen-0.24, see
|
|
|
|
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1773259#c5 for possible patch
|
|
|
|
;; (untested)
|
|
|
|
(define-public rust-cbindgen-0.23
|
|
|
|
(package
|
|
|
|
(inherit rust-cbindgen-0.24)
|
|
|
|
(name "rust-cbindgen")
|
|
|
|
(version "0.23.0")
|
|
|
|
(source (origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (crate-uri "cbindgen" version))
|
|
|
|
(file-name (string-append name "-" version ".tar.gz"))
|
|
|
|
(sha256
|
|
|
|
(base32
|
|
|
|
"006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav"))))))
|
|
|
|
|
2020-09-23 10:45:50 +02:00
|
|
|
;; 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.
|
2022-10-19 08:24:38 +02:00
|
|
|
(define %firefox-esr-build-id "20221018000000")
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-08-10 06:06:22 +02:00
|
|
|
(define-public firefox-esr
|
2020-07-20 09:04:53 +02:00
|
|
|
(package
|
2022-08-10 06:06:22 +02:00
|
|
|
(name "firefox-esr")
|
2022-10-19 08:24:38 +02:00
|
|
|
(version "102.4.0esr")
|
2020-07-20 09:04:53 +02:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
|
|
|
|
version "/source/firefox-" version ".source.tar.xz"))
|
|
|
|
(sha256
|
2022-10-19 08:24:38 +02:00
|
|
|
(base32 "0klh3lbm0zdmv90kmmpkzgn15pfjibr7zsjy3kvbzpql97fhv7z7"))))
|
2020-07-20 09:04:53 +02:00
|
|
|
(build-system gnu-build-system)
|
|
|
|
(arguments
|
2022-02-13 18:04:22 +01:00
|
|
|
(list
|
|
|
|
#:configure-flags
|
|
|
|
#~(let ((clang #$(this-package-native-input "clang"))
|
|
|
|
(wasi-sysroot #$(this-package-native-input "wasm32-wasi-clang-toolchain")))
|
|
|
|
`("--enable-application=browser"
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; Configuration
|
|
|
|
"--with-system-jpeg"
|
|
|
|
"--with-system-zlib"
|
|
|
|
;; "--with-system-png" ;require libpng-apng >= 1.6.35
|
|
|
|
"--with-system-icu"
|
|
|
|
"--enable-system-ffi"
|
|
|
|
"--enable-system-pixman"
|
|
|
|
"--enable-jemalloc"
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; see https://bugs.gnu.org/32833
|
2022-07-03 01:33:05 +02:00
|
|
|
"--with-system-nspr"
|
2022-02-13 18:04:22 +01:00
|
|
|
;; "--with-system-nss"
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
,(string-append "--with-clang-path="
|
|
|
|
clang "/bin/clang")
|
|
|
|
,(string-append "--with-libclang-path="
|
|
|
|
clang "/lib")
|
|
|
|
,(string-append "--with-wasi-sysroot=" wasi-sysroot "/wasm32-wasi")
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; Distribution
|
|
|
|
"--with-distribution-id=org.nonguix"
|
|
|
|
"--disable-official-branding"
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; Features
|
|
|
|
"--disable-tests"
|
|
|
|
"--disable-updater"
|
|
|
|
"--enable-pulseaudio"
|
|
|
|
"--disable-crashreporter"
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; Build details
|
|
|
|
"--disable-debug"
|
|
|
|
"--enable-rust-simd"
|
|
|
|
"--enable-release"
|
|
|
|
"--enable-optimize"
|
|
|
|
"--enable-strip"
|
|
|
|
"--disable-elf-hack"))
|
|
|
|
#:imported-modules %cargo-utils-modules
|
|
|
|
#:modules `((ice-9 regex)
|
2020-07-20 09:04:53 +02:00
|
|
|
(ice-9 ftw)
|
|
|
|
(srfi srfi-26)
|
|
|
|
,@%gnu-build-system-modules)
|
2022-02-13 18:04:22 +01:00
|
|
|
#:phases
|
|
|
|
#~(modify-phases %standard-phases
|
|
|
|
(add-after 'unpack 'fix-preferences
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
(let ((port (open-file "browser/app/profile/firefox.js" "a")))
|
|
|
|
(define (write-setting key value)
|
|
|
|
(format port "~%pref(\"~a\", ~a);~%"
|
|
|
|
key value)
|
|
|
|
(format #t "fix-preferences: setting value of ~a to ~a~%"
|
|
|
|
key value))
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; We should allow Firefox sandbox to read the store directory,
|
|
|
|
;; because Firefox sandbox have access to /usr on FHS distros.
|
|
|
|
(write-setting "security.sandbox.content.read_path_whitelist"
|
|
|
|
(string-append "\"" (%store-directory) "/\""))
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; XDG settings should be managed by Guix.
|
|
|
|
(write-setting "browser.shell.checkDefaultBrowser" "false")
|
|
|
|
(close-port port))))
|
|
|
|
(add-after 'fix-preferences 'fix-ffmpeg-runtime-linker
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
(let* ((ffmpeg (assoc-ref inputs "ffmpeg"))
|
|
|
|
(libavcodec (string-append ffmpeg "/lib/libavcodec.so")))
|
|
|
|
;; Arrange to load libavcodec.so by its absolute file name.
|
|
|
|
(substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp"
|
|
|
|
(("libavcodec\\.so")
|
|
|
|
libavcodec)))))
|
|
|
|
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
|
|
|
(lambda _
|
|
|
|
(use-modules (guix build cargo-utils))
|
|
|
|
(let ((null-hash
|
|
|
|
;; This is the SHA256 output of an empty string.
|
|
|
|
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
|
|
|
|
(for-each
|
|
|
|
(lambda (file)
|
|
|
|
(format #t "patch-cargo-checksums: patching checksums in ~a~%"
|
|
|
|
file)
|
|
|
|
(substitute* file
|
|
|
|
(("(checksum = )\".*\"" all name)
|
|
|
|
(string-append name "\"" null-hash "\""))))
|
|
|
|
(find-files "." "Cargo\\.lock$"))
|
|
|
|
(for-each generate-all-checksums
|
|
|
|
'("build"
|
|
|
|
"dom/media"
|
|
|
|
"dom/webauthn"
|
|
|
|
"gfx"
|
|
|
|
"intl"
|
|
|
|
"js"
|
|
|
|
"media"
|
|
|
|
"modules"
|
|
|
|
"mozglue/static/rust"
|
|
|
|
"netwerk"
|
|
|
|
"remote"
|
|
|
|
"security/manager/ssl"
|
|
|
|
"servo"
|
|
|
|
"storage"
|
|
|
|
"third_party/rust"
|
|
|
|
"toolkit"
|
|
|
|
"xpcom/rust"
|
|
|
|
"services")))))
|
|
|
|
(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\",") ""))))
|
|
|
|
(delete 'bootstrap)
|
2022-08-10 06:06:22 +02:00
|
|
|
(add-before 'configure 'set-build-id
|
|
|
|
;; Firefox will write the timestamp to output, which is harmful
|
|
|
|
;; for reproducibility, so change it to a fixed date. Use a
|
|
|
|
;; separate phase for easier modification with inherit.
|
|
|
|
(lambda _
|
|
|
|
(setenv "MOZ_BUILD_DATE" #$%firefox-esr-build-id)))
|
2022-02-13 18:04:22 +01:00
|
|
|
(replace 'configure
|
|
|
|
(lambda* (#:key inputs outputs configure-flags #:allow-other-keys)
|
|
|
|
(setenv "AUTOCONF" (string-append (assoc-ref inputs "autoconf")
|
|
|
|
"/bin/autoconf"))
|
|
|
|
(setenv "SHELL" (which "bash"))
|
|
|
|
(setenv "CONFIG_SHELL" (which "bash"))
|
2022-08-10 06:06:22 +02:00
|
|
|
(setenv "MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE" "system")
|
|
|
|
;; This should use the host info probably (does firefox build on
|
|
|
|
;; non-x86_64 though?)
|
|
|
|
(setenv "GUIX_PYTHONPATH"
|
|
|
|
(string-append (getcwd)
|
|
|
|
"/obj-x86_64-pc-linux-gnu/_virtualenvs/build"))
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; Use Clang, Clang is 2x faster than GCC
|
|
|
|
(setenv "AR" "llvm-ar")
|
|
|
|
(setenv "NM" "llvm-nm")
|
|
|
|
(setenv "CC" "clang")
|
|
|
|
(setenv "CXX" "clang++")
|
|
|
|
(setenv "WASM_CC"
|
|
|
|
(string-append
|
|
|
|
(assoc-ref inputs "wasm32-wasi-clang-toolchain")
|
|
|
|
"/bin/clang"))
|
|
|
|
(setenv "WASM_CXX"
|
|
|
|
(string-append
|
|
|
|
(assoc-ref inputs "wasm32-wasi-clang-toolchain")
|
|
|
|
"/bin/clang++"))
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
(setenv "MOZ_NOSPAM" "1")
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
(setenv "MOZBUILD_STATE_PATH" (getcwd))
|
2021-10-18 20:45:20 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
(let* ((mozconfig (string-append (getcwd) "/mozconfig"))
|
|
|
|
(out (assoc-ref outputs "out"))
|
|
|
|
(flags (cons (string-append "--prefix=" out)
|
|
|
|
configure-flags)))
|
|
|
|
(format #t "build directory: ~s~%" (getcwd))
|
|
|
|
(format #t "configure flags: ~s~%" flags)
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
(define write-flags
|
|
|
|
(lambda flags
|
|
|
|
(display (string-join
|
|
|
|
(map (cut string-append "ac_add_options " <>)
|
|
|
|
flags)
|
|
|
|
"\n"))
|
|
|
|
(display "\n")))
|
|
|
|
(with-output-to-file mozconfig
|
|
|
|
(lambda ()
|
|
|
|
(apply write-flags flags)
|
|
|
|
;; The following option unsets Telemetry Reporting. With the Addons Fiasco,
|
|
|
|
;; Mozilla was found to be collecting user's data, including saved passwords and
|
|
|
|
;; web form data, without users consent. Mozilla was also found shipping updates
|
|
|
|
;; to systems without the user's knowledge or permission.
|
|
|
|
;; As a result of this, use the following command to permanently disable
|
|
|
|
;; telemetry reporting in Firefox.
|
|
|
|
(display "unset MOZ_TELEMETRY_REPORTING\n")))
|
|
|
|
(setenv "MOZCONFIG" mozconfig))
|
|
|
|
(invoke "./mach" "configure")))
|
|
|
|
(replace 'build
|
|
|
|
(lambda* (#:key (make-flags '()) (parallel-build? #t)
|
|
|
|
#:allow-other-keys)
|
|
|
|
(apply invoke "./mach" "build"
|
|
|
|
;; mach will use parallel build if possible by default
|
|
|
|
`(,@(if parallel-build?
|
|
|
|
'()
|
|
|
|
'("-j1"))
|
|
|
|
,@make-flags))))
|
|
|
|
(add-after 'build 'neutralise-store-references
|
|
|
|
(lambda _
|
|
|
|
;; Mangle the store references to compilers & other build tools in
|
|
|
|
;; about:buildconfig, reducing Firefox's closure by 1 GiB on x86-64.
|
|
|
|
(let* ((build-dir (car (scandir "." (cut string-prefix? "obj-" <>))))
|
|
|
|
(file (string-append build-dir "/dist/bin/chrome/toolkit/content/global/buildconfig.html")))
|
|
|
|
(substitute* file
|
|
|
|
(((format #f "(~a/)([0-9a-df-np-sv-z]{32})"
|
|
|
|
(regexp-quote (%store-directory)))
|
|
|
|
_ store hash)
|
|
|
|
(string-append store
|
|
|
|
(string-take hash 8)
|
|
|
|
"<!-- Guix: not a runtime dependency -->"
|
|
|
|
(string-drop hash 8)))))))
|
|
|
|
(replace 'install
|
|
|
|
(lambda _ (invoke "./mach" "install")))
|
|
|
|
(add-after 'install 'wrap-program
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
(lib (string-append out "/lib"))
|
2022-02-26 22:48:38 +01:00
|
|
|
;; TODO: make me a loop again
|
|
|
|
(mesa-lib (string-append (assoc-ref inputs "mesa") "/lib"))
|
|
|
|
;; For the integration of native notifications
|
|
|
|
(libnotify-lib (string-append (assoc-ref inputs "libnotify")
|
|
|
|
"/lib"))
|
|
|
|
;; For hardware video acceleration via VA-API
|
|
|
|
(libva-lib (string-append (assoc-ref inputs "libva")
|
|
|
|
"/lib"))
|
|
|
|
(pulseaudio-lib (string-append (assoc-ref inputs "pulseaudio")
|
|
|
|
"/lib"))
|
|
|
|
;; For U2F and WebAuthn
|
|
|
|
(eudev-lib (string-append (assoc-ref inputs "eudev") "/lib"))
|
2022-02-13 18:04:22 +01:00
|
|
|
(gtk-share (string-append (assoc-ref inputs "gtk+")
|
|
|
|
"/share")))
|
|
|
|
(wrap-program (car (find-files lib "^firefox$"))
|
2022-02-26 22:48:38 +01:00
|
|
|
`("LD_LIBRARY_PATH" prefix (,mesa-lib ,libnotify-lib ,libva-lib
|
|
|
|
,pulseaudio-lib ,eudev-lib))
|
2022-02-13 18:04:22 +01:00
|
|
|
`("XDG_DATA_DIRS" prefix (,gtk-share))
|
|
|
|
`("MOZ_LEGACY_PROFILES" = ("1"))
|
|
|
|
`("MOZ_ALLOW_DOWNGRADE" = ("1"))))))
|
|
|
|
(add-after 'wrap-program 'install-desktop-entry
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
(let* ((desktop-file "taskcluster/docker/firefox-snap/firefox.desktop")
|
|
|
|
(applications (string-append #$output "/share/applications")))
|
|
|
|
(substitute* desktop-file
|
|
|
|
(("^Exec=firefox") (string-append "Exec=" #$output "/bin/firefox"))
|
|
|
|
(("Icon=.*") "Icon=firefox\n")
|
|
|
|
(("NewWindow") "new-window")
|
|
|
|
(("NewPrivateWindow") "new-private-window")
|
|
|
|
(("StartupNotify=true")
|
|
|
|
"StartupNotify=true\nStartupWMClass=Navigator"))
|
|
|
|
(install-file desktop-file applications))))
|
|
|
|
(add-after 'install-desktop-entry 'install-icons
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
(let ((icon-source-dir
|
2020-07-20 09:04:53 +02:00
|
|
|
(string-append
|
2022-02-13 18:04:22 +01:00
|
|
|
#$output "/lib/firefox/browser/chrome/icons/default")))
|
|
|
|
(for-each
|
|
|
|
(lambda (size)
|
|
|
|
(let ((dest (string-append #$output "/share/icons/hicolor/"
|
|
|
|
size "x" size "/apps")))
|
|
|
|
(mkdir-p dest)
|
|
|
|
(symlink (string-append icon-source-dir
|
|
|
|
"/default" size ".png")
|
|
|
|
(string-append dest "/firefox.png"))))
|
|
|
|
'("16" "32" "48" "64" "128"))))))
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; Test will significantly increase build time but with little rewards.
|
|
|
|
#:tests? #f
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; WARNING: Parallel build will consume lots of memory!
|
|
|
|
;; If you have encountered OOM issue in build phase, try disable it.
|
|
|
|
;; #:parallel-build? #f
|
2020-07-20 09:04:53 +02:00
|
|
|
|
2022-02-13 18:04:22 +01:00
|
|
|
;; Some dynamic lib was determined at runtime, so rpath check may fail.
|
|
|
|
#:validate-runpath? #f))
|
2020-07-20 09:04:53 +02:00
|
|
|
(inputs
|
2022-02-26 22:48:38 +01:00
|
|
|
(list
|
|
|
|
bzip2
|
|
|
|
cairo
|
|
|
|
cups
|
|
|
|
dbus-glib
|
|
|
|
freetype
|
|
|
|
ffmpeg
|
|
|
|
gdk-pixbuf
|
|
|
|
glib
|
|
|
|
gtk+
|
|
|
|
gtk+-2
|
|
|
|
hunspell
|
2022-08-10 06:06:22 +02:00
|
|
|
icu4c-71
|
2022-02-26 22:48:38 +01:00
|
|
|
jemalloc
|
|
|
|
libcanberra
|
|
|
|
libevent
|
|
|
|
libffi
|
|
|
|
libgnome
|
|
|
|
libjpeg-turbo
|
|
|
|
libnotify
|
|
|
|
;; libpng-apng
|
|
|
|
libva
|
|
|
|
libvpx
|
|
|
|
libxcomposite
|
|
|
|
libxft
|
|
|
|
libxinerama
|
|
|
|
libxscrnsaver
|
|
|
|
libxt
|
|
|
|
mesa
|
|
|
|
mit-krb5
|
2022-07-03 01:33:05 +02:00
|
|
|
nspr-4.32
|
2022-02-26 22:48:38 +01:00
|
|
|
;; nss
|
|
|
|
pango
|
2022-08-13 16:58:34 +02:00
|
|
|
pipewire
|
2022-02-26 22:48:38 +01:00
|
|
|
pixman
|
|
|
|
pulseaudio
|
|
|
|
startup-notification
|
|
|
|
sqlite
|
|
|
|
eudev
|
|
|
|
unzip
|
|
|
|
zip
|
|
|
|
zlib))
|
2020-07-20 09:04:53 +02:00
|
|
|
(native-inputs
|
2022-02-26 22:48:38 +01:00
|
|
|
(list
|
|
|
|
alsa-lib
|
|
|
|
autoconf-2.13
|
2022-09-22 22:50:11 +02:00
|
|
|
`(,rust-firefox-esr "cargo")
|
2022-10-21 17:07:00 +02:00
|
|
|
clang
|
|
|
|
llvm
|
2022-02-26 22:48:38 +01:00
|
|
|
wasm32-wasi-clang-toolchain
|
|
|
|
m4
|
|
|
|
nasm
|
|
|
|
node
|
|
|
|
perl
|
|
|
|
pkg-config
|
|
|
|
python
|
2022-09-22 22:50:11 +02:00
|
|
|
rust-firefox-esr
|
2022-08-10 06:06:22 +02:00
|
|
|
rust-cbindgen-0.23
|
2022-02-26 22:48:38 +01:00
|
|
|
which
|
|
|
|
yasm))
|
2020-07-20 09:04:53 +02:00
|
|
|
(home-page "https://mozilla.org/firefox/")
|
|
|
|
(synopsis "Trademarkless version of Firefox")
|
|
|
|
(description
|
|
|
|
"Full-featured browser client built from Firefox source tree, without
|
2022-08-10 06:06:22 +02:00
|
|
|
the official icon and the name \"firefox\". This is the Extended Support
|
|
|
|
Release (ESR) version.")
|
2020-07-20 09:04:53 +02:00
|
|
|
(license license:mpl2.0)))
|
2020-11-01 19:21:00 +01:00
|
|
|
|
2022-08-10 06:06:22 +02:00
|
|
|
(define-public firefox-esr/wayland
|
|
|
|
(package
|
|
|
|
(inherit firefox-esr)
|
|
|
|
(name "firefox-esr-wayland")
|
|
|
|
(native-inputs '())
|
|
|
|
(inputs
|
|
|
|
`(("bash" ,bash-minimal)
|
|
|
|
("firefox-esr" ,firefox-esr)))
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
(arguments
|
|
|
|
'(#:modules ((guix build utils))
|
|
|
|
#:builder
|
|
|
|
(begin
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
(let* ((bash (assoc-ref %build-inputs "bash"))
|
|
|
|
(firefox (assoc-ref %build-inputs "firefox-esr"))
|
|
|
|
(out (assoc-ref %outputs "out"))
|
|
|
|
(exe (string-append out "/bin/firefox")))
|
|
|
|
(mkdir-p (dirname exe))
|
|
|
|
|
|
|
|
(call-with-output-file exe
|
|
|
|
(lambda (port)
|
|
|
|
(format port "#!~a
|
|
|
|
MOZ_ENABLE_WAYLAND=1 exec ~a $@\n"
|
|
|
|
(string-append bash "/bin/bash")
|
|
|
|
(string-append firefox "/bin/firefox"))))
|
|
|
|
(chmod exe #o555)
|
|
|
|
|
|
|
|
;; Provide the manual and .desktop file.
|
|
|
|
(copy-recursively (string-append firefox "/share")
|
|
|
|
(string-append out "/share"))
|
|
|
|
(substitute* (string-append
|
|
|
|
out "/share/applications/firefox.desktop")
|
|
|
|
((firefox) out))
|
|
|
|
#t))))))
|
|
|
|
|
|
|
|
;; 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.
|
2022-10-19 06:40:41 +02:00
|
|
|
(define %firefox-build-id "20221018000000")
|
2022-08-10 06:06:22 +02:00
|
|
|
|
|
|
|
(define-public firefox
|
|
|
|
(package
|
|
|
|
(inherit firefox-esr)
|
|
|
|
(name "firefox")
|
2022-10-19 06:40:41 +02:00
|
|
|
(version "106.0")
|
2022-08-10 06:06:22 +02:00
|
|
|
(source
|
|
|
|
(origin
|
|
|
|
(method url-fetch)
|
|
|
|
(uri (string-append "https://archive.mozilla.org/pub/firefox/releases/"
|
|
|
|
version "/source/firefox-" version ".source.tar.xz"))
|
|
|
|
(sha256
|
2022-10-19 06:40:41 +02:00
|
|
|
(base32 "063ybmz4skn8wlgzpir2kk4a76nnkr8jdmly8wblz0askpyynihm"))))
|
2022-08-10 06:06:22 +02:00
|
|
|
(arguments
|
|
|
|
(substitute-keyword-arguments (package-arguments firefox-esr)
|
|
|
|
((#:phases phases)
|
|
|
|
#~(modify-phases #$phases
|
|
|
|
(replace 'set-build-id
|
|
|
|
(lambda _
|
|
|
|
(setenv "MOZ_BUILD_DATE" #$%firefox-build-id)))))))
|
|
|
|
(native-inputs
|
|
|
|
(modify-inputs (package-native-inputs firefox-esr)
|
2022-09-22 22:52:58 +02:00
|
|
|
(replace "rust" rust-firefox)
|
|
|
|
(replace "rust:cargo" `(,rust-firefox "cargo"))
|
2022-08-23 21:14:33 +02:00
|
|
|
(replace "node" node-lts)
|
2022-08-10 06:06:22 +02:00
|
|
|
(replace "rust-cbindgen" rust-cbindgen-0.24)))
|
|
|
|
(description
|
|
|
|
"Full-featured browser client built from Firefox source tree, without
|
|
|
|
the official icon and the name \"firefox\".")))
|
|
|
|
|
|
|
|
(define-public firefox/wayland
|
|
|
|
(package
|
|
|
|
(inherit firefox)
|
|
|
|
(name "firefox-wayland")
|
|
|
|
(native-inputs '())
|
|
|
|
(inputs
|
|
|
|
`(("bash" ,bash-minimal)
|
|
|
|
("firefox" ,firefox)))
|
|
|
|
(build-system trivial-build-system)
|
|
|
|
(arguments
|
|
|
|
'(#:modules ((guix build utils))
|
|
|
|
#:builder
|
|
|
|
(begin
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
(let* ((bash (assoc-ref %build-inputs "bash"))
|
|
|
|
(firefox (assoc-ref %build-inputs "firefox"))
|
|
|
|
(out (assoc-ref %outputs "out"))
|
|
|
|
(exe (string-append out "/bin/firefox")))
|
|
|
|
(mkdir-p (dirname exe))
|
|
|
|
|
|
|
|
(call-with-output-file exe
|
|
|
|
(lambda (port)
|
|
|
|
(format port "#!~a
|
2021-06-24 00:11:37 +02:00
|
|
|
MOZ_ENABLE_WAYLAND=1 exec ~a $@\n"
|
2022-08-10 06:06:22 +02:00
|
|
|
(string-append bash "/bin/bash")
|
|
|
|
(string-append firefox "/bin/firefox"))))
|
|
|
|
(chmod exe #o555)
|
|
|
|
|
|
|
|
;; Provide the manual and .desktop file.
|
|
|
|
(copy-recursively (string-append firefox "/share")
|
|
|
|
(string-append out "/share"))
|
|
|
|
(substitute* (string-append
|
|
|
|
out "/share/applications/firefox.desktop")
|
|
|
|
((firefox) out))
|
|
|
|
#t))))))
|