Kivy builds need virtualenv

diff --git a/buildserver/cookbooks/kivy/recipes/default.rb b/buildserver/cookbooks/kivy/recipes/default.rb
index 916c5bce1917680a5321ffc9a39fa8ad6f831bcb..368b4cd8b94b34c5caa2f6d1813710083b16bae4 100644 (file)
--- a/buildserver/cookbooks/kivy/recipes/default.rb
+++ b/buildserver/cookbooks/kivy/recipes/default.rb
@@ -1,7 +1,7 @@
 
 user = node[:settings][:user]
 
-%w{cython python-pygame python-pip python-opengl python-gst0.10 python-enchant libgl1-mesa-dev libgles2-mesa-dev}.each do |pkg|
+%w{cython python-pygame python-pip python-virtualenv python-opengl python-gst0.10 python-enchant libgl1-mesa-dev libgles2-mesa-dev}.each do |pkg|
   package pkg do
     action :install
   end

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 5ab4488d4d642b82de6b88a4f08ed6950902da30..89c52f7113e9c5f64b83af2479579f996750682d 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -549,6 +549,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         cmd += ' ANDROIDNDK=' + config['ndk_path']
         cmd += ' ANDROIDNDKVER=r9'
         cmd += ' ANDROIDAPI=' + str(bconfig.get('app', 'android.api'))
+        cmd += ' VIRTUALENV=virtualenv'
         cmd += ' ./distribute.sh'
         cmd += ' -m ' + "'" + ' '.join(modules) + "'" 
         cmd += ' -d fdroid'