kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages' dependencies. On the Nixpkgs side, we no longer propagate the dependency on cmake (to reduce closure size), so downstream dependencies had to be adjusted for most packages that depend on kdelibs.
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchurl, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa
|
||||
{ stdenv, fetchurl, automoc4, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa
|
||||
, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2
|
||||
, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4
|
||||
, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular
|
||||
, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase
|
||||
, libodfgen, opencolorio, openjpeg, pstoedit, librevenge
|
||||
}:
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "calligra-2.8.7";
|
||||
@@ -14,12 +14,13 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl pkgconfig ];
|
||||
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
|
||||
|
||||
# TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers
|
||||
# not found: xbase, openjpeg(too new)
|
||||
|
||||
buildInputs = [ kdelibs attica zlib libpng boost mesa kdepimlibs
|
||||
buildInputs = [
|
||||
kdelibs attica zlib libpng boost mesa kdepimlibs
|
||||
createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
|
||||
sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl
|
||||
shared_desktop_ontologies okular libodfgen opencolorio openjpeg
|
||||
|
||||
Reference in New Issue
Block a user