]> dgit.raspbian.org Git - git-annex.git/commitdiff
allow magicmime on windows
authorJoey Hess <joeyh@joeyh.name>
Mon, 26 Oct 2020 17:34:27 +0000 (13:34 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 26 Oct 2020 17:34:27 +0000 (13:34 -0400)
John Thorvald Wodder II got it working using
https://github.com/datalad/file-windows so don't hard-disable it.

The stack.yaml still disables this build flag, because it needs an extra
C library to be installed, which stack cannot automate.

git-annex.cabal

index 5a59b2d3efa083194208c73d656258cfb7a09571..605833f1fe485912559a24f6d66cd7a7b58b4466 100644 (file)
@@ -595,9 +595,8 @@ Executable git-annex
     CPP-Options: -DWITH_TORRENTPARSER
 
   if flag(MagicMime)
-    if (! os(windows))
-      Build-Depends: magic
-      CPP-Options: -DWITH_MAGICMIME
+    Build-Depends: magic
+    CPP-Options: -DWITH_MAGICMIME
 
   if flag(Benchmark)
     Build-Depends: criterion