git-annex: fix installation location of .desktop files and icons

This commit is contained in:
sternenseemann 2024-04-21 21:35:08 +02:00
parent fd8ab54324
commit cdedb41039
2 changed files with 20 additions and 0 deletions

View File

@ -411,6 +411,13 @@ self: super: {
rm -r $out/doc/?ndroid*
'';
};
patches = drv.patches or [ ] ++ [
# Prevent .desktop files from being installed to $out/usr/share.
# TODO(@sternenseemann): submit upstreamable patch resolving this
# (this should be possible by also taking PREFIX into account).
./patches/git-annex-no-usr-prefix.patch
];
}) super.git-annex;
# Too strict bounds on servant

View File

@ -0,0 +1,13 @@
diff --git a/Utility/FreeDesktop.hs b/Utility/FreeDesktop.hs
index 896b89b991..6cbb4f90ae 100644
--- a/Utility/FreeDesktop.hs
+++ b/Utility/FreeDesktop.hs
@@ -112,7 +112,7 @@ desktopfile f = f ++ ".desktop"
{- Directory used for installation of system wide data files.. -}
systemDataDir :: FilePath
-systemDataDir = "/usr/share"
+systemDataDir = "/share"
{- Directory used for installation of system wide config files. -}
systemConfigDir :: FilePath