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