calligra: 3.1.0 -> 3.2.0

This commit is contained in:
Peter Hoeg 2020-08-24 07:49:12 +08:00
parent ca9b0c2beb
commit 7bb2382432

View file

@ -7,7 +7,7 @@
knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons,
kwindowsystem, kxmlgui, sonnet, threadweaver,
kcontacts, akonadi, akonadi-calendar, akonadi-contacts,
eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen,
eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen,
librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon,
poppler, pstoedit, qca-qt5, vc
# TODO: package Spnav, m2mml LibEtonyek, Libqgit2
@ -15,18 +15,14 @@
mkDerivation rec {
pname = "calligra";
version = "3.1.0";
version = "3.2.0";
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE=";
};
patches = [ ./qt5_11.patch ];
enableParallelBuilding = true;
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
boost qtwebkit qtx11extras shared-mime-info
@ -35,7 +31,7 @@ mkDerivation rec {
kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts
ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver
kcontacts akonadi akonadi-calendar akonadi-contacts
eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge
eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge
libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc
];
@ -43,13 +39,10 @@ mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
postInstall = ''
for i in $out/bin/*; do
wrapProgram $i \
--prefix PATH ':' "${pstoedit.out}/bin" \
--prefix XDG_DATA_DIRS ':' "${breeze-icons}/share"
done
'';
qtWrapperArgs = [
"--prefix PATH : ${lib.getBin pstoedit}/bin"
"--prefix XDG_DATA_DIRS : ${breeze-icons}/share"
];
meta = with lib; {
description = "A suite of productivity applications";
@ -64,7 +57,5 @@ mkDerivation rec {
maintainers = with maintainers; [ phreedom ebzzry zraexy ];
platforms = platforms.linux;
license = with licenses; [ gpl2 lgpl2 ];
hydraPlatforms = [];
broken = true; # fails to start, kde home not found
};
}