Each "variant" of libreoffice gets its own subdirectory src-$variant
where files w/ source references are stored. In the directory is also
override.nix which allows you to override derivation attributes in
addition to source files.
* libreoffice-still: -> 6.0.6.2
* (newer than our current 'fresh!')
* libreoffice-fresh: -> 6.1.0.3
* 6.1.1(.1) is currently pre-release, FWIW
* Use normal gcc, not gcc5
* dropping 'glibc' from buildInputs fixed this (?)
* remove many fixes/touchups/workarounds/hacks
* hopefully everything still works for everyone
* disable online update since that seems unlikely to work anyway
* fix autogen/configure invocations
* disable libnumbertext in 6.1.x since not packaged
* drop 'touch solenv/inc/target.mk' as unclear what it was for
and doesn't seem to be currently needed
* cleanup link gen a bit[1]
* split checks to check phase
[1]
primary motivation was to stop creating links like:
'libreoffice-6.0.5.2/src/-libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz'
'libreoffice-6.0.5.2/src/libxslt-1.1.32.tar.gz' -> '/nix/store/503v5hmhm430bld0h078gacmkniwdllr-libxslt-1.1.32.tar.gz'
This is mostly accomplished by simply using the 'md5name' field
which the python script kindly generates for us
(including the use of non-md5 if md5 is not set or empty).
1. For some reason libreoffice-still was still referencing the Fresh
expression.
2. Moved gdb from buildInputs to nativeBuildInputs.
3. Minor update for both branches.
I've extracted some of libraries and made expression simpler.
(cherry picked from commit 66e6f99d40350a4b2a235913a1fa77d88b1a44a6)
Signed-off-by: Domen Kožar <domen@dev.si>
Also update its dependencies.
Update libcdr to 0.1.0
Update libmwaw to 0.3.2 from 0.3.1
Update libvisio to 0.1.0
Update libwpd to 0.10.0
Update libwpg to 0.3.0
These updates are require by LO update and also require each other.
Note that many of these libraries now require librevenge.
In LibreOffice expression per se:
- Note that liborcus is built separately because it wants Boost to be
specified in a way that main LO build doesn't ensure.
- libixion from 0.7.0 tarball has libixion-0.8 package version.
- libgltf is in src/libgltf but listed in download.lst without any
comments.
- Make variable with the name libreoffice-translations-${version}.tar.xz
and the same value is inserted; the same for -help-. Fetching gives
a strange error without that. Apparently everyone just builds git
checkouts.
- There are some conditionals in download.lst that require manual
handling. I am not sure there is a simple way to process them in
generate-libreoffice-srcs.sh.
* Use more system libraries
* Enable KDE4 desktop integration
* Split preparation between postUnpack, patchPhase and preConfigure
Viric, feel free to revert (parts of) this commit.
Florian Brandes