git-annex: fix installation location of .desktop files and icons
This commit is contained in:
parent
fd8ab54324
commit
cdedb41039
|
@ -411,6 +411,13 @@ self: super: {
|
||||||
rm -r $out/doc/?ndroid*
|
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;
|
}) super.git-annex;
|
||||||
|
|
||||||
# Too strict bounds on servant
|
# Too strict bounds on servant
|
||||||
|
|
|
@ -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
|
Loading…
Reference in New Issue
Block a user