From 8b22e1df9c2e7cbe4196229f82d935ed3b5aa959 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 2 Aug 2015 23:02:53 -0400 Subject: [PATCH] last changes to fix android build --- Makefile | 2 +- standalone/no-th/evilsplicer-headers.hs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aac9a3a5e6..bc027fc899 100644 --- a/Makefile +++ b/Makefile @@ -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 903f1fccf0..1bc895370d 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