summaryrefslogtreecommitdiff
path: root/Build/NullSoftInstaller.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-28 13:18:44 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-28 13:18:44 -0400
commit4e6ae471667beaa308607b3b03522ebabaf3014a (patch)
tree8772da57337397c4a6d85232c3d5faa49a17fd32 /Build/NullSoftInstaller.hs
parent20edc36c790793faf1a01494572d3200308bb114 (diff)
Fix build with directory-1.2.6.2.
It started exporting a isSymbolicLink which supports windows. But, git-annex does no use symlinks on windows yet and this conflicts with the function by the same name from unix-compat, so hide it.
Diffstat (limited to 'Build/NullSoftInstaller.hs')
-rw-r--r--Build/NullSoftInstaller.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Build/NullSoftInstaller.hs b/Build/NullSoftInstaller.hs
index 7af6babef..b8c988062 100644
--- a/Build/NullSoftInstaller.hs
+++ b/Build/NullSoftInstaller.hs
@@ -21,7 +21,7 @@
{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
import Development.NSIS
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.FilePath
import Control.Monad
import Control.Applicative