diff options
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 4231e2a2d1..0872ca1295 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 <andreas@enge.fr> -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il> @@ -337,8 +337,7 @@ in C/C++.") (let ((out (assoc-ref outputs "out"))) (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) - (setenv "AUTOCONF" (string-append (assoc-ref inputs "autoconf") - "/bin/autoconf")) + (setenv "AUTOCONF" (which "autoconf")) (apply invoke "./configure" (cons (string-append "--prefix=" out) configure-flags)))))))) @@ -394,8 +393,7 @@ in C/C++.") (chdir "run-configure-from-here") (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) - (setenv "AUTOCONF" (string-append (assoc-ref inputs "autoconf") - "/bin/autoconf")) + (setenv "AUTOCONF" (which "autoconf")) (apply invoke "../js/src/configure" (cons (string-append "--prefix=" out) configure-flags)) @@ -417,7 +415,7 @@ in C/C++.") (define-public mozjs-78 (package (inherit mozjs-60) - (version "78.5.0") + (version "78.10.1") (source (origin (method url-fetch) ;; TODO: Switch to IceCat source once available on ftp.gnu.org. @@ -426,7 +424,7 @@ in C/C++.") version "esr.source.tar.xz")) (sha256 (base32 - "1442yjmwz69hkfcvh8kkb60jf4c9ms0pac04nc3xw2da13v4zxai")))) + "0gyg2p6i1wmmfghwg13pp6fj8j8xz6c14f6bbnf4pf0f5c3la7y4")))) (arguments `(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' #:modules ((guix build cargo-utils) @@ -476,8 +474,7 @@ in C/C++.") (chdir "run-configure-from-here") (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) - (setenv "AUTOCONF" (string-append (assoc-ref inputs "autoconf") - "/bin/autoconf")) + (setenv "AUTOCONF" (which "autoconf")) (apply invoke "../js/src/configure" (cons (string-append "--prefix=" out) configure-flags)) @@ -550,10 +547,10 @@ in C/C++.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-3) - ("rust" ,rust) - ("cargo" ,rust "cargo"))) + ("rust" ,rust-1.41) + ("cargo" ,rust-1.41 "cargo"))) (inputs - `(("icu4c" ,icu4c-68) + `(("icu4c" ,icu4c) ("readline" ,readline) ("zlib" ,zlib))))) @@ -929,8 +926,8 @@ from forcing GEXP-PROMISE." ("patch" ,(canonical-package patch)) - ("rust" ,rust-1.41) - ("cargo" ,rust-1.41 "cargo") + ("rust" ,rust) + ("cargo" ,rust "cargo") ("rust-cbindgen" ,rust-cbindgen-0.14) ("llvm" ,llvm) ("clang" ,clang) @@ -1460,8 +1457,7 @@ standards of the IceCat project.") (setenv "CC" "gcc") (setenv "MOZ_NOSPAM" "1") (setenv "PYTHON" - (string-append (assoc-ref inputs "python2") - "/bin/python")) + (search-input-file inputs "/bin/python")) (setenv "MOZ_BUILD_DATE" ,%icedove-build-id) ; avoid timestamp (setenv "LDFLAGS" (string-append "-Wl,-rpath=" (assoc-ref outputs "out") @@ -1607,7 +1603,7 @@ standards of the IceCat project.") (base32 "1nnz90h5w9skpdwm8ilndcwfx9d7k9cn6gzh32y4jil95da13813"))))) ("autoconf" ,autoconf-2.13) - ("cargo" ,rust-1.41 "cargo") + ("cargo" ,rust "cargo") ("clang" ,clang) ("llvm" ,llvm) ("nasm" ,nasm) @@ -1616,7 +1612,7 @@ standards of the IceCat project.") ("pkg-config" ,pkg-config) ("python" ,python) ("python2" ,python-2.7) - ("rust" ,rust-1.41) + ("rust" ,rust) ("rust-cbindgen" ,rust-cbindgen-0.14) ("which" ,which) ("yasm" ,yasm))) |