diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-08-02 23:02:53 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-08-02 23:02:53 -0400 |
commit | 5293f046a77b3202a3820eb12aaec1ce29459785 (patch) | |
tree | b43de5efe824702ae283c84d86371d0345fe9540 | |
parent | 095b17569d4fec9cf788032084ad9af70dd644d3 (diff) |
last changes to fix android build
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | standalone/no-th/evilsplicer-headers.hs | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -212,7 +212,7 @@ android: Build/EvilSplicer # and not overwritten.) cp -uR tmp/splices/* tmp/androidtree || true # Some additional dependencies needed by the expanded splices. - sed -i 's/^ Build-Depends: */ Build-Depends: yesod-core, shakespeare, blaze-markup, file-embed, wai-app-static, wai, unordered-containers, /' tmp/androidtree/git-annex.cabal + sed -i 's/^ Build-Depends: */ Build-Depends: yesod-core, yesod-routes, shakespeare, blaze-markup, file-embed, wai-app-static, wai, unordered-containers, /' tmp/androidtree/git-annex.cabal # Avoid warnings due to sometimes unused imports added for the splices. sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports /i' tmp/androidtree/git-annex.cabal sed -i 's/Extensions: /Extensions: MagicHash /i' tmp/androidtree/git-annex.cabal diff --git a/standalone/no-th/evilsplicer-headers.hs b/standalone/no-th/evilsplicer-headers.hs index 903f1fccf..1bc895370 100644 --- a/standalone/no-th/evilsplicer-headers.hs +++ b/standalone/no-th/evilsplicer-headers.hs @@ -24,6 +24,7 @@ import qualified "blaze-markup" Text.Blaze.Internal import qualified Yesod.Core.Widget import qualified Yesod.Routes.TH.Types import qualified Yesod.Core.Dispatch +import qualified Yesod.Routes.Dispatch import qualified WaiAppStatic.Storage.Embedded import qualified WaiAppStatic.Storage.Embedded.Runtime import qualified Data.FileEmbed |