diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-14 15:34:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-14 15:34:06 -0400 |
| commit | 83fa4cffcde9df7d3963eaff70f4d581c93bbf9f (patch) | |
| tree | d970c419d7b52035629af0bfdbc70591008a76d9 | |
| parent | 15b8169348a3f19bd51f988526f1288697dd5129 (diff) | |
use cabal.config when installing native
| -rwxr-xr-x | standalone/android/install-haskell-packages | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index d9d494b0b..94adefd07 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -20,11 +20,6 @@ cabalopts="$@" setupcabal () { cabal update - # Workaround for http://www.reddit.com/r/haskell/comments/26045a/if_youre_finding_cabal_cant_build_your_project/ - # should be able to remove this eventually. - cabal install transformers-compat -fthree - cabal install mtl-2.1.3.1 - # Some packages fail to install in a non unicode locale. LANG=en_US.UTF-8 export LANG @@ -73,10 +68,11 @@ patched () { } installgitannexdeps () { - pushd ../.. + rm -f git-annex.cabal + ln -s ../../git-annex.cabal echo cabal install --only-dependencies "$@" cabal install --only-dependencies "$@" - popd + rm -f git-annex.cabal } install_pkgs () { |