ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

KDE 4.10: kdelibs, kdepim: remove todo notices, fix compilation against openEXR.

Browse Source
This commit is contained in:
Evgeny Egorochkin 2013-05-25 11:45:45 +03:00
parent 92d81b1952
commit 6b9c2218c6
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix
View File

@ -3,54 +3,31 @@
, openexr, avahi, kerberos, attr, shared_desktop_ontologies, libXScrnSaver , openexr, avahi, kerberos, attr, shared_desktop_ontologies, libXScrnSaver
, automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
, getopt, udev, herqq, phonon, libjpeg, xz , getopt, udev, herqq, phonon, libjpeg, xz, ilmbase
, pkgconfig , pkgconfig
}: }:
kde { kde {
buildInputs = buildInputs =
[ pkgconfig [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq jasper
# attr libdbusmenu_qt libXScrnSaver libxslt polkit_qt_1 qca2
attica #todo: update to 4.1 shared_desktop_ontologies xz udev libjpeg kerberos openexr
avahi
bzip2
enchant
fam
# getopt
giflib
grantlee # todo: update to 0.3
herqq
jasper
libdbusmenu_qt #todo: update to 0.9.2
libXScrnSaver
libxslt
# pcre
polkit_qt_1 qca2
shared_desktop_ontologies xz udev
# libxml2
libjpeg
kerberos
#openexr # todo: update openexr to 1.7.1. make it compile maybe need ilmbase although it's supposedly propagated
]; ];
propagatedBuildInputs = [ qt4 soprano NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
strigi # todo: update to 0.7.8
phonon ];
propagatedNativeBuildInputs = [ automoc4 cmake perl propagatedBuildInputs = [ qt4 soprano strigi phonon ];
shared_mime_info #todo: update to 1.1
]; propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
# TODO: make sonnet plugins (dictionaries) really work. # TODO: make sonnet plugins (dictionaries) really work.
# There are a few hardcoded paths. # There are a few hardcoded paths.
# Let kdelibs find openexr
# Split plugins from libs? # Split plugins from libs?
patches = [ ../files/polkit-install.patch ]; patches = [ ../files/polkit-install.patch ];
# cmake fails to find acl.h because of C++-style comment # cmake fails to find acl.h because of C++-style comment
# TODO: OpenEXR
cmakeFlags = [ cmakeFlags = [
"-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
"-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook" "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"

2
pkgs/desktops/kde-4.10/kdepim.nix
View File

@ -3,7 +3,7 @@
, nepomuk_widgets, dblatex }: , nepomuk_widgets, dblatex }:
kde { kde {
#todo: update grantlee to 0.3
buildInputs = buildInputs =
[ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets
libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex