From ccffb16e0f254db3c07033fafed0d397f005b902 Mon Sep 17 00:00:00 2001
From: Gleb Popov <6yearold@gmail.com>
Date: Thu, 12 May 2022 17:38:18 +0300
Subject: Remove with_utf8 option and enable its features by default.

---
 xmobar.cabal | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/xmobar.cabal b/xmobar.cabal
index a19e701..e8520f1 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -32,10 +32,6 @@ flag with_xft
   description: Use Xft to render text. UTF-8 support included.
   default: False
 
-flag with_utf8
-  description: With UTF-8 support.
-  default: True
-
 flag with_inotify
   description: inotify support (modern Linux only). Required for the Mail and MBox plugins.
   default: False
@@ -187,6 +183,8 @@ library
 
     ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind
 
+    cpp-options: -DUTF8
+
     build-depends:
                   X11 >= 1.6.1,
                   aeson >= 1.4.7.1,
@@ -206,7 +204,8 @@ library
                   stm >= 2.3 && < 2.6,
                   time,
                   transformers,
-                  unix
+                  unix,
+                  utf8-string >= 0.3 && < 1.1
 
     if impl(ghc < 8.0.2)
        -- Disable building with GHC before 8.0.2.
@@ -229,10 +228,6 @@ library
        other-modules: Xmobar.X11.MinXft
        cpp-options: -DXFT
 
-    if flag(with_utf8) || flag(all_extensions)
-       build-depends: utf8-string >= 0.3 && < 1.1
-       cpp-options: -DUTF8
-
     if flag(with_inotify) || flag(all_extensions)
        build-depends: hinotify >= 0.3 && < 0.5
        other-modules: Xmobar.Plugins.Mail, Xmobar.Plugins.MBox
-- 
cgit v1.2.3