aboutsummaryrefslogtreecommitdiff
path: root/Build/DesktopFile.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/DesktopFile.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/DesktopFile.hs')
-rw-r--r--Build/DesktopFile.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs
index cac520d77..f832f310c 100644
--- a/Build/DesktopFile.hs
+++ b/Build/DesktopFile.hs
@@ -20,7 +20,7 @@ import Utility.OSX
import Assistant.Install.AutoStart
import Assistant.Install.Menu
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
import System.Environment
#ifndef mingw32_HOST_OS
import System.Posix.User