diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-15 00:10:38 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-02-19 20:03:35 -0500 |
| commit | d318ccc36308171a74b4863ea25a3dded05a2851 (patch) | |
| tree | da19a6069eb9552fa80c3ef26784953349cb0806 /gnu/packages/gnuzilla.scm | |
| parent | 25f9d4c4c26ca7c02d785036b9477f0a3373679e (diff) | |
| download | guix-d318ccc36308171a74b4863ea25a3dded05a2851.tar.gz | |
gnu: icecat: Unbundle nss and nspr.
* gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Add nspr-next and
nss-next.
[configure-flags]: Re-instate the "--with-system-nspr" and "--with-system-nss"
configure flags.
[phases] {remove-bundled-libraries}: Update comment.
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
| -rw-r--r-- | gnu/packages/gnuzilla.scm | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index acdbe5ca37..6a9d3d18ad 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -715,10 +715,8 @@ variable defined below. It requires guile-json to be installed." mit-krb5 hunspell libnotify - ;; See <https://bugs.gnu.org/32833> - ;; and related comments in the 'remove-bundled-libraries' phase. - ;; UNBUNDLE-ME! nspr - ;; UNBUNDLE-ME! nss + nspr-next + nss-next shared-mime-info sqlite eudev @@ -813,12 +811,8 @@ variable defined below. It requires guile-json to be installed." ;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released ;; UNBUNDLE-ME! "--with-system-libvpx" "--with-system-icu" - - ;; See <https://bugs.gnu.org/32833> - ;; and related comments in the - ;; 'remove-bundled-libraries' phase below. - ;; UNBUNDLE-ME! "--with-system-nspr" - ;; UNBUNDLE-ME! "--with-system-nss" + "--with-system-nspr" + "--with-system-nss" ;; UNBUNDLE-ME! "--with-system-harfbuzz" ;; UNBUNDLE-ME! "--with-system-graphite2" @@ -867,12 +861,9 @@ variable defined below. It requires guile-json to be installed." ;; FIXME: A script from the bundled nspr is used. ;;"nsprpub" ;; - ;; FIXME: With the update to IceCat 60, using system NSS - ;; broke certificate validation. See - ;; <https://bugs.gnu.org/32833>. For now, we use - ;; the bundled NSPR and NSS. TODO: Investigate, - ;; and try to unbundle these libraries again. - ;; UNBUNDLE-ME! "security/nss" + ;; FIXME: Some of the bundled NSS sources are used + ;; to build third_party/prio. + ;;"security/nss" ;; ;; TODO: Use more system media libraries. See: ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=517422> |