Revert "gnu: make-torbrowser: Unbundle nss."

This reverts commit 8ee7a32782eafe9542e6be413fe40bc5c1dfd67f,
which caused mullvadbrowser (and also torbrowser if uBlock Origin
was installed) to hang at times, becoming unable to load webpages
for the rest of the session. See #546.

Change-Id: I98efc8831813b17882a837c45b9f05deeac2d1c2
Reviewed-by: Mark H Weaver <mhw@netris.org>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm
index f8d77e220f4..f008fc101a6 100644
--- a/gnu/packages/tor-browsers.scm
+++ b/gnu/packages/tor-browsers.scm
@@ -257,7 +257,7 @@ Browser.")
            hunspell
            libnotify
            nspr
-           nss-rapid  ; requires v. 3.101, so nss won't cut it for now.
+           ;; UNBUNDLE-ME! nss  (pending upgrade of 'nss' to 3.90 or later)
            shared-mime-info
            sqlite
            eudev
@@ -357,7 +357,7 @@ Browser.")
          "--with-system-libvpx"
          "--with-system-icu"
          "--with-system-nspr"
-         "--with-system-nss"
+         ;; UNBUNDLE-ME! "--with-system-nss" ; pending upgrade of 'nss' to 3.90
 
          ;; UNBUNDLE-ME! "--with-system-harfbuzz"
          ;; UNBUNDLE-ME! "--with-system-graphite2"
@@ -404,7 +404,7 @@ Browser.")
                           ;;"nsprpub"
                           ;;
                           ;; FIXME: Some of the bundled NSS sources are used
-                          ;; to build netwerk/socket/neqo_glue.
+                          ;; to build third_party/prio.
                           ;;"security/nss"
                           ;;
                           ;; TODO: Use more system media libraries.  See: