Merge pull request #73704 from romildo/upd.softmaker-office

freeoffice: 971 -> 973
This commit is contained in:
José Romildo Malaquias 2019-11-20 06:20:50 -03:00 committed by GitHub
commit d9a6c04e0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View File

@ -2,13 +2,13 @@
callPackage ./generic.nix (args // rec {
pname = "freeoffice";
version = "971";
version = "973";
edition = "2018";
suiteName = "FreeOffice";
src = fetchurl {
url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz";
sha256 = "1h36pjbpbiy4cw383cbrwh1jx2kp1ay29734zailmhifz53gj44f";
sha256 = "0xac4ynf1lfh8qmni5bhp4ybaamdfngva4bqaq21n1m4pgrx1ba5";
};
archive = "freeoffice${edition}.tar.lzma";

View File

@ -96,6 +96,10 @@ in stdenv.mkDerivation rec {
done
done
# freeoffice 973 misses the 96x96 application icons, giving broken symbolic links
# remove broken symbolic links
find $out -xtype l -ls -exec rm {} \;
# Add desktop items
${desktopItems.planmaker.buildCommand}
${desktopItems.presentations.buildCommand}