public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #80353 from mmilata/libreoffice-spellcheck-dicpath

Browse Source 
libreoffice: wrapper: add hunspell dirs to DICPATH
This commit is contained in:
Michael Raskin 2020-02-25 21:39:11 +00:00 committed by GitHub
commit fcf9e23e73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/office/libreoffice/src-fresh/primary.nix
View File

@ -26,7 +26,8 @@ rec {
sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr"; sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr";
}; };
# TODO: dictionaries # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
# it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";

3
pkgs/applications/office/libreoffice/src-still/primary.nix
View File

@ -26,7 +26,8 @@ rec {
sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv"; sha256 = "01g09bbn1ixrsfj4l0x6x8p06dz9hnlrhnr3f3xb42drmi9ipvjv";
}; };
# TODO: dictionaries # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
# it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";

7
pkgs/applications/office/libreoffice/wrapper.sh
View File

@ -17,6 +17,13 @@ if uname | grep Linux > /dev/null &&
export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session" export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
fi fi
for PROFILE in $NIX_PROFILES; do
HDIR="$PROFILE/share/hunspell"
if [ -d "$HDIR" ]; then
export DICPATH=$DICPATH''${DICPATH:+:}$HDIR
fi
done
"@libreoffice@/bin/$(basename "$0")" "$@" "@libreoffice@/bin/$(basename "$0")" "$@"
code="$?" code="$?"