summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-15 15:05:31 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-15 15:05:31 -0400
commit83199be6cc49b895f76de66b46f7ebe5d168b5f6 (patch)
tree8a15470c4646a3a2e64d7568ff005ed92900445f
parentb3587891cfbdb972816bac939571b62bb7b9fd4f (diff)
don't try to pull in libmagic on windows
May be possible to install the library somehow, but it certainly won't be available normally, and so cabal will fail to install magic.
-rw-r--r--git-annex.cabal5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-annex.cabal b/git-annex.cabal
index fa496d8e0..2a647ac9f 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -230,8 +230,9 @@ Executable git-annex
CPP-Options: -DWITH_TORRENTPARSER
if flag(MagicMime)
- Build-Depends: magic
- CPP-Options: -DWITH_MAGICMIME
+ if (! os(windows))
+ Build-Depends: magic
+ CPP-Options: -DWITH_MAGICMIME
if flag(ConcurrentOutput)
Build-Depends: concurrent-output (>= 1.6)