From 1668793e69b7e7c78b7c5b4fd05a256c8ea9f0b1 Mon Sep 17 00:00:00 2001 From: jao Date: Sun, 8 Mar 2015 20:47:21 +0100 Subject: Fix for GHC 7.8.4 (issue #213) --- src/Plugins/Date.hs | 5 +++++ xmobar.cabal | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/Plugins/Date.hs b/src/Plugins/Date.hs index a263536..6cbef7e 100644 --- a/src/Plugins/Date.hs +++ b/src/Plugins/Date.hs @@ -16,11 +16,16 @@ -- ----------------------------------------------------------------------------- +{-# LANGUAGE CPP #-} + module Plugins.Date (Date(..)) where import Plugins +#ifdef GHC783 import System.Locale +#endif + import Control.Monad (liftM) import Data.Time diff --git a/xmobar.cabal b/xmobar.cabal index f63ed3b..05d19f5 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -127,6 +127,9 @@ executable xmobar if impl (ghc < 7) cpp-options: -DGHC6 + if impl (ghc < 7.8.4) + cpp-options: -DGHC783 + if flag(with_xft) || flag(all_extensions) build-depends: utf8-string == 0.3.*, X11-xft >= 0.2 && < 0.4 other-modules: MinXft -- cgit v1.2.3