mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

work around another dep problem

Browse source
This commit is contained in:
Joey Hess 2014-05-26 13:53:53 -04:00
parent 70fd42521f
commit 7145d25972
Failed to extract signature
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
standalone/android/buildchroot-inchroot
View file

@ -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 ant default-jdk rsync wget gnupg lsof
apt-get -y install gettext unzip python apt-get -y install gettext unzip python
apt-get -y install locales 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 echo en_US.UTF-8 UTF-8 >> /etc/locale.gen
locale-gen locale-gen
apt-get clean apt-get clean

5
standalone/android/install-haskell-packages
View file

@ -136,10 +136,7 @@ echo
echo native build echo native build
echo echo
setupcabal setupcabal
# --reorder-goals seems to be necessary to work around installgitannexdeps
# 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
echo echo
echo echo