TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Maxim Cournoyer 2023-02-15 00:10:38 -05:00
parent 25f9d4c4c2
commit d318ccc363
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/gnuzilla.scm
View File

@ -715,10 +715,8 @@ variable defined below. It requires guile-json to be installed."
mit-krb5 mit-krb5
hunspell hunspell
libnotify libnotify
;; See <https://bugs.gnu.org/32833> nspr-next
;; and related comments in the 'remove-bundled-libraries' phase. nss-next
;; UNBUNDLE-ME! nspr
;; UNBUNDLE-ME! nss
shared-mime-info shared-mime-info
sqlite sqlite
eudev 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-theora" ; wants theora-1.2, not yet released
;; UNBUNDLE-ME! "--with-system-libvpx" ;; UNBUNDLE-ME! "--with-system-libvpx"
"--with-system-icu" "--with-system-icu"
"--with-system-nspr"
;; See <https://bugs.gnu.org/32833> "--with-system-nss"
;; and related comments in the
;; 'remove-bundled-libraries' phase below.
;; UNBUNDLE-ME! "--with-system-nspr"
;; UNBUNDLE-ME! "--with-system-nss"
;; UNBUNDLE-ME! "--with-system-harfbuzz" ;; UNBUNDLE-ME! "--with-system-harfbuzz"
;; UNBUNDLE-ME! "--with-system-graphite2" ;; 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. ;; FIXME: A script from the bundled nspr is used.
;;"nsprpub" ;;"nsprpub"
;; ;;
;; FIXME: With the update to IceCat 60, using system NSS ;; FIXME: Some of the bundled NSS sources are used
;; broke certificate validation. See ;; to build third_party/prio.
;; <https://bugs.gnu.org/32833>. For now, we use ;;"security/nss"
;; the bundled NSPR and NSS. TODO: Investigate,
;; and try to unbundle these libraries again.
;; UNBUNDLE-ME! "security/nss"
;; ;;
;; TODO: Use more system media libraries. See: ;; TODO: Use more system media libraries. See:
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=517422> ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=517422>