diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 16:05:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-07-18 19:50:01 +0200 |
| commit | 0e47fcced442d8e7c1b05184fdc1c14f10ed04ec (patch) | |
| tree | 4ae844bc0ec3c670f8697bdc24362c122fa718ad /gnu/packages/gnuzilla.scm | |
| parent | e4b70bc55a538569465bcedee19d1f2607308e65 (diff) | |
| parent | 8b1bde7bb3936a64244824500ffe60f123704437 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index a0e72be427..74403751a9 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -694,8 +694,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "78.11.0-guix0-preview1") -(define %icecat-build-id "20210601000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "78.12.0-guix0-preview1") +(define %icecat-build-id "20210713000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -717,7 +717,7 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0zjpzkxx3wc2840d7q4b9lnkj1kwk1qps29s9c83jf5y6xclnf9q")))) + "043lplq5i4ax6nh4am3b2bm8dbn4rzzcji1zp0yy1pad4nwahmcb")))) (upstream-icecat-base-version "78.7.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) @@ -1501,7 +1501,9 @@ standards of the IceCat project.") "ac_add_options --with-system-nspr\n" "ac_add_options --with-system-nss\n" "ac_add_options --with-system-zlib\n" - "ac_add_options --with-user-appdir=\\.icedove\n")))) + "ac_add_options --with-user-appdir=\\.icedove\n" + "mk_add_options MOZ_MAKE_FLAGS=-j" + (number->string (parallel-job-count)) "\n")))) (display (getcwd)) (newline) (display "mach configure") @@ -1543,10 +1545,12 @@ standards of the IceCat project.") (gtk (assoc-ref inputs "gtk+")) (gtk-share (string-append gtk "/share")) (pulseaudio (assoc-ref inputs "pulseaudio")) - (pulseaudio-lib (string-append pulseaudio "/lib"))) + (pulseaudio-lib (string-append pulseaudio "/lib")) + (eudev (assoc-ref inputs "eudev")) + (eudev-lib (string-append eudev "/lib"))) (wrap-program (car (find-files lib "^icedove$")) `("XDG_DATA_DIRS" prefix (,gtk-share)) - `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib))) + `("LD_LIBRARY_PATH" prefix (,pulseaudio-lib ,eudev-lib))) #t)))))) (inputs `(("bzip2" ,bzip2) @@ -1582,6 +1586,7 @@ standards of the IceCat project.") ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("startup-notification" ,startup-notification) + ("eudev" ,eudev) ("unzip" ,unzip) ("zip" ,zip) ("zlib" ,zlib))) |