onlyoffice-bin_latest: use nixpkgs noto cjk instead of a custom one
This commit is contained in:
parent
e958ffafbc
commit
8f8e2bcf04
@ -26,6 +26,7 @@
|
||||
, libdrm
|
||||
, makeWrapper
|
||||
, mesa
|
||||
, noto-fonts-cjk-sans
|
||||
, nspr
|
||||
, nss
|
||||
, pulseaudio
|
||||
@ -54,18 +55,6 @@ let
|
||||
# TODO: Find out which of these fonts we'd be allowed to distribute along
|
||||
# with this package, or how to make this easier for users otherwise.
|
||||
|
||||
# Not using the `noto-fonts-cjk` package from nixpkgs, because it was
|
||||
# reported that its `.ttc` file is not picked up by OnlyOffice, see:
|
||||
# https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816
|
||||
noto-fonts-cjk = fetchurl {
|
||||
url =
|
||||
let
|
||||
version = "v20201206-cjk";
|
||||
in
|
||||
"https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf";
|
||||
sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4=";
|
||||
};
|
||||
|
||||
runtimeLibs = lib.makeLibraryPath [
|
||||
curl
|
||||
glibc
|
||||
@ -134,10 +123,6 @@ let
|
||||
dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@ -179,12 +164,14 @@ in
|
||||
|
||||
# In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it.
|
||||
# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code.
|
||||
# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them
|
||||
buildFHSEnv {
|
||||
name = derivation.name;
|
||||
|
||||
targetPkgs = pkgs': [
|
||||
curl
|
||||
derivation
|
||||
noto-fonts-cjk-sans
|
||||
];
|
||||
|
||||
runScript = "/bin/onlyoffice-desktopeditors";
|
||||
|
Loading…
Reference in New Issue
Block a user