From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 1 Dec 2013 16:47:27 +0000 (+0000)
Subject: Kivy builds need virtualenv
X-Git-Tag: 0.1~135
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a42d00c2a7179366a44704e6461809d42fc3d444;p=fdroidserver.git

Kivy builds need virtualenv
---

diff --git a/buildserver/cookbooks/kivy/recipes/default.rb b/buildserver/cookbooks/kivy/recipes/default.rb
index 916c5bce..368b4cd8 100644
--- 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 5ab4488d..89c52f71 100644
--- 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'