summaryrefslogtreecommitdiff
path: root/Assistant
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 /Assistant
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 'Assistant')
-rw-r--r--Assistant/Install/AutoStart.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Install/AutoStart.hs b/Assistant/Install/AutoStart.hs
index 57450304b..b2799101b 100644
--- a/Assistant/Install/AutoStart.hs
+++ b/Assistant/Install/AutoStart.hs
@@ -14,7 +14,7 @@ import Utility.FreeDesktop
#ifdef darwin_HOST_OS
import Utility.OSX
import Utility.Path
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
#endif
installAutoStart :: FilePath -> FilePath -> IO ()