diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-26 13:53:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-26 13:53:53 -0400 |
| commit | bdeba9fa0b56da0cf3b6911470f6bf6c54bfefcb (patch) | |
| tree | 0aca393b721a006ad17bceb0f00a3f6d2eb16e90 | |
| parent | ead4c8b6f5bf4364d69102e1de3a0e655350f584 (diff) | |
work around another dep problem
| -rwxr-xr-x | standalone/android/buildchroot-inchroot | 2 | ||||
| -rwxr-xr-x | standalone/android/install-haskell-packages | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/standalone/android/buildchroot-inchroot b/standalone/android/buildchroot-inchroot index b5bf59ef5..5c462d8cc 100755 --- a/standalone/android/buildchroot-inchroot +++ b/standalone/android/buildchroot-inchroot @@ -20,6 +20,8 @@ apt-get -y install libgnutls-dev libxml2-dev libgsasl7-dev pkg-config c2hs apt-get -y install ant default-jdk rsync wget gnupg lsof apt-get -y install gettext unzip python apt-get -y install locales +# works around a dependncy issue with the current hjsmin +apt-get -y install libghc-hjsmin-dev echo en_US.UTF-8 UTF-8 >> /etc/locale.gen locale-gen apt-get clean diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index 733918afd..72cacb3b3 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -136,10 +136,7 @@ echo echo native build echo setupcabal -# --reorder-goals seems to be necessary to work around -# http://www.reddit.com/r/haskell/comments/26045a/if_youre_finding_cabal_cant_build_your_project/ -# should be able to remove it eventually -installgitannexdeps --reorder-goals +installgitannexdeps echo echo |