Build fixes for Debian Jessie.

1 files changed, 12 insertions, 5 deletions

diff --git a/kiki.cabal b/kiki.cabal
index e301d7f..9e9e314 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -15,6 +15,10 @@ Flag cryptonite
   Description: Use newer cryptonite-based x509 version 1.6 and higher
   Default: True
 
+Flag hourglass
+  Description: Use newer hourglass-based x509 version 1.5 and higher
+  Default: True
+
 Executable kiki
     Main-is: kiki.hs
     -- base >=4.6 due to use of readEither in KikiD.Message
@@ -24,15 +28,18 @@ Executable kiki
                      asn1-types -any, asn1-encoding -any,
                      dataenc -any, text -any, pretty -any, pretty-show -any,
                      bytestring -any, binary -any,
-                     unix, time, 
+                     unix, time,
                      containers -any, process -any, filepath -any,
-                     network -any, old-locale -any, zlib -any,
-                     hourglass -any
+                     network -any, old-locale -any, zlib -any
     if !flag(cryptonite)
       Build-Depends:   crypto-pubkey >=0.2.3, cryptohash -any,
-                       crypto-pubkey-types -any, x509 <1.6
+                       crypto-pubkey-types -any
+      if flag(hourglass)
+        Build-Depends:   hourglass -any, x509 >=1.5 && <1.6
+      else
+        Build-Depends:   x509 <1.6
     else
-      Build-Depends:   cryptonite, x509 >=1.6, memory
+      Build-Depends:   cryptonite, x509 >=1.6, memory, hourglass
     ghc-options:     -O2 -fwarn-unused-binds -fwarn-unused-imports
     c-sources: dotlock.c