summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-05-24 00:09:58 -0400
committerJoey Hess2014-05-24 00:09:58 -0400
commitcc46cb19421d99f93fdc78cda50761dba3556b21 (patch)
treeb8a1ae9b09edabe6f94a8dec119d11243fbfb862 /src/Propellor
parent7004b34a718de4c4ed8e79679e40e2907aa7e310 (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 13f1ac12..7941d7b4 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -88,6 +88,9 @@ buildDepsNoHaskellLibs = Apt.installed ["git", "rsync", "moreutils", "ca-certifi
"libghc-dbus-dev", "libghc-fdo-notify-dev", "libghc-network-protocol-xmpp-dev"
]
+noBuildDeps :: Property
+noBuildDeps = propertyList "no build deps" []
+
-- Installs current versions of git-annex's deps from cabal, but only
-- does so once.
cabalDeps :: Property
@@ -109,10 +112,10 @@ androidContainer dockerImage crontimes timeout = Docker.container "android-git-a
(dockerImage $ System (Debian Stable) "i386")
& Apt.stdSourcesList Stable
& Apt.unattendedUpgrades
- & builder "android" crontimes timeout True
+ & builder' noBuildDeps "android" crontimes timeout True
-- Use git-annex's android chroot setup script, which will install
- -- ghc-android and the NDK, etc, in the home directory of the
- -- builder user.
+ -- ghc-android and the NDK, all build deps, etc, in the home
+ -- directory of the builder user.
& scriptProperty
[ "cd " ++ builddir ++ " && ./standalone/android/buildchroot-inchroot"
]