diff options
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0b39774a2e..2cd7f0f7d8 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge <[email protected]> -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <[email protected]> +;;; Copyright © 2013-2022 Ludovic Courtès <[email protected]> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Mark H Weaver <[email protected]> ;;; Copyright © 2015 Sou Bunnbu <[email protected]> ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <[email protected]> @@ -51,6 +51,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) #:use-module (guix build-system trivial) + #:use-module (guix build-system mozilla) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -205,7 +206,7 @@ fractional-second-digits-append-item.js") rust `(,rust "cargo"))) (inputs - (list icu4c-71 readline zlib)) + (list icu4c readline zlib)) (propagated-inputs (list nspr)) ; in the Requires.private field of mozjs-*.pc (home-page @@ -244,7 +245,7 @@ in C/C++.") (delete-file "non262/Intl/DateTimeFormat/tz-environment-variable.js")))))))) (inputs (modify-inputs (package-inputs mozjs) - (replace "icu4c" icu4c))))) + (replace "icu4c" icu4c-69))))) (define-public mozjs-78 (package @@ -264,6 +265,25 @@ in C/C++.") (substitute-keyword-arguments (package-arguments mozjs) ((#:phases phases) #~(modify-phases #$phases + (add-after 'unpack 'patch-for-python-3.10 + (lambda _ + ;; Some classes were moved from collections to collections.abc + ;; in Python 3.10. + (substitute* "python/mozbuild/mozbuild/util.py" + (("collections\\.Sequence") + "collections.abc.Sequence")) + (substitute* "python/mozbuild/mozbuild/makeutil.py" + (("from collections import Iterable") + "from collections.abc import Iterable")) + (substitute* "python/mozbuild/mozbuild/backend/configenvironment.py" + (("from collections import Iterable, OrderedDict") + "from collections import OrderedDict\n\ +from collections.abc import Iterable")) + (substitute* + "testing/mozbase/manifestparser/manifestparser/filters.py" + (("from collections import defaultdict, MutableSequence") + "from collections import defaultdict\n\ +from collections.abc import MutableSequence")))) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) ;; The configure script does not accept environment variables as @@ -346,7 +366,7 @@ in C/C++.") rust `(,rust "cargo"))) (inputs - (list icu4c readline zlib)))) + (list icu4c-69 readline zlib)))) (define mozilla-compare-locales (origin @@ -658,7 +678,7 @@ in C/C++.") (name "icecat") (version %icecat-version) (source icecat-source) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs (list alsa-lib bzip2 @@ -690,7 +710,7 @@ in C/C++.") libffi ffmpeg libvpx - icu4c-71 ; TODO: Change to 'icu4c' when its version is >= 71. + icu4c pixman pulseaudio mesa @@ -1368,7 +1388,7 @@ ca495991b7852b855")) gtk+ gtk+-2 hunspell - icu4c-71 + icu4c libcanberra libevent libffi |