From 335011af9df14666d83ecb778938525bc9f6253a Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Wed, 18 Oct 2017 19:42:55 +0100
Subject: [PATCH] nss: install into image, remove nss and nspr from chromium

Add nss dependency for x86 and arm to virtual/network.
---
 packages/addons/addon-depends/nss/package.mk | 3 +++
 packages/addons/browser/chromium/package.mk  | 6 ------
 packages/virtual/network/package.mk          | 5 +++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/addons/addon-depends/nss/package.mk b/packages/addons/addon-depends/nss/package.mk
index 7f411b4d94..81ed9c7024 100644
--- a/packages/addons/addon-depends/nss/package.mk
+++ b/packages/addons/addon-depends/nss/package.mk
@@ -73,4 +73,7 @@ makeinstall_target() {
   mkdir -p $SYSROOT_PREFIX/usr/include/nss
   cp -RL dist/{public,private}/nss/* $SYSROOT_PREFIX/usr/include/nss
   cp -L dist/Linux*/lib/pkgconfig/nss.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+
+  mkdir -p .install_pkg/usr/lib
+    cp -PL dist/Linux*/lib/*.so .install_pkg/usr/lib
 }
diff --git a/packages/addons/browser/chromium/package.mk b/packages/addons/browser/chromium/package.mk
index 96d27db019..11940b21e3 100644
--- a/packages/addons/browser/chromium/package.mk
+++ b/packages/addons/browser/chromium/package.mk
@@ -161,12 +161,6 @@ addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules
   cp -PL $(get_build_dir gdk-pixbuf)/.install_pkg/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules
 
-  # nss
-  cp -PL $(get_build_dir nss)/dist/Linux*OPT.OBJ/lib/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib
-
-  # nspr
-  cp -PL $(get_build_dir nspr)/.install_pkg/usr/lib/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib
-
   # libexif
   cp -PL $(get_build_dir libexif)/.install_pkg/usr/lib/* $ADDON_BUILD/$PKG_ADDON_ID/lib
 
diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk
index b5b0adf1e9..09dab0117e 100644
--- a/packages/virtual/network/package.mk
+++ b/packages/virtual/network/package.mk
@@ -39,3 +39,8 @@ fi
 if [ "$OPENVPN_SUPPORT" = "yes" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET openvpn"
 fi
+
+# nss needed by inputstream.adaptive, chromium etc.
+if [ "$TARGET_ARCH" = "x86_64" ] || [ "$TARGET_ARCH" = "arm" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET nss"
+fi