diff options
| author | jao <jao@gnu.org> | 2015-03-08 20:47:21 +0100 |
|---|---|---|
| committer | jao <jao@gnu.org> | 2015-03-08 20:47:21 +0100 |
| commit | 1668793e69b7e7c78b7c5b4fd05a256c8ea9f0b1 (patch) | |
| tree | 3f5837f747d6582cab3ac3c4e89cf56440e37f10 | |
| parent | 4e86a438d32dacfce6d429e475b225aa8d0e8e02 (diff) | |
| download | xmobar-1668793e69b7e7c78b7c5b4fd05a256c8ea9f0b1.tar.gz xmobar-1668793e69b7e7c78b7c5b4fd05a256c8ea9f0b1.tar.bz2 | |
Fix for GHC 7.8.4 (issue #213)
| -rw-r--r-- | src/Plugins/Date.hs | 5 | ||||
| -rw-r--r-- | xmobar.cabal | 3 |
2 files changed, 8 insertions, 0 deletions
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 |