bc9837ea42
- git-annex now supports either filepath-bytestring or filepath (>= 1.5.2) with the new OsPath API. For GHC 9.8, we have too stick to filepath-bytestring and manually disable the OsPath flag. However, we can already support building git-annex with GHC 9.10 and implement our overrides in a future proof way. Due to code changes relating to OsPath, our patch has to be rebased. - The Utility.* modules gain a few dependencies, but for modules that aren't used in Setup.hs. Consequently, our approach of reusing the setup package db in GHC for the installer tool managed by the git-annex Makefile is no longer enough.
14 lines
493 B
Diff
14 lines
493 B
Diff
diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs
|
|
index 896b89b991..6cbb4f90ae 100644
|
|
--- a/Utility/FreeDesktop.hs
|
|
+++ b/Utility/FreeDesktop.hs
|
|
@@ -106,7 +106,7 @@ desktopfile f = toOsPath $ f ++ ".desktop"
|
|
|
|
{- Directory used for installation of system wide data files.. -}
|
|
systemDataDir :: OsPath
|
|
-systemDataDir = literalOsPath "/usr/share"
|
|
+systemDataDir = literalOsPath "/share"
|
|
|
|
{- Directory used for installation of system wide config files. -}
|
|
systemConfigDir :: OsPath
|