[pkg] add leap.pixelated and leap.pixelated_www as dependencies

from here on, we're depending on leap's fork.

2 files changed, 4 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index c9ce3a7e..ce9d06ec 100644
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,7 @@ install_helpers:
 	cp src/leap/bitmask/vpn/helpers/linux/se.leap.bitmask.policy /usr/share/polkit-1/actions/
 
 install_pixelated:
-	# install pixelated from our repo until assets get packaged.
-	pip install requests==2.11.1 whoosh chardet
-	pip install pixelated-www pixelated-user-agent --find-links https://downloads.leap.se/libs/pixelated/
+	pip install leap.pixelated leap.pixelated-www
 
 qt-resources:
 	pyrcc5 pkg/branding/icons.qrc -o src/leap/bitmask/gui/app_rc.py
diff --git a/setup.py b/setup.py
index 8b1c103e..919a91e8 100644
--- a/setup.py
+++ b/setup.py
@@ -29,15 +29,16 @@ if platform.system() == "Windows":
     required.append(['appdirs'])
     required.append(['python-gnupg'])
 
-# TODO change to leap.soledad when we tag 0.10
 mail_deps = ['leap.soledad[client]', 'gnupg']
+pix_deps = ['leap.pixelated', 'leap.pixelated_www']
 gui_deps = ['vext.pyqt5', 'leap.bitmask_js']
 tor_deps = ['txtorcon']
 extras = {
     'mail': mail_deps,
+    'pixelated': pix_deps,
     'gui': gui_deps,
     'backend': mail_deps,
-    'all': mail_deps + gui_deps,
+    'all': mail_deps + gui_deps + pix_deps,
     'tor': tor_deps
 }