mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
* Update kdepimlibs.
* Remove unnecessary NIX_LDFLAGS hacks. svn path=/nixpkgs/branches/kde-4.7/; revision=27887
This commit is contained in:
parent
489d1be918
commit
aa6f8184b5
|
@ -48,7 +48,7 @@ recurseIntoAttrs rec {
|
|||
|
||||
kdelibs = callPackage ./libs { };
|
||||
|
||||
#kdepimlibs = callPackage ./pimlibs { };
|
||||
kdepimlibs = callPackage ./pimlibs { };
|
||||
|
||||
### BASE
|
||||
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
|
||||
, kdelibs, automoc4, akonadi, soprano}:
|
||||
{ stdenv, kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
|
||||
, kdelibs, automoc4, akonadi, soprano, phonon, shared_desktop_ontologies, libxslt }:
|
||||
|
||||
kde.package {
|
||||
|
||||
buildInputs = [ cmake automoc4 perl shared_mime_info ];
|
||||
propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs
|
||||
akonadi soprano ];
|
||||
buildInputs =
|
||||
[ cmake kdelibs qt4 automoc4 phonon boost gpgme shared_mime_info
|
||||
shared_desktop_ontologies soprano libical libxslt openldap
|
||||
cyrus_sasl akonadi perl
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "KDE PIM libraries";
|
||||
|
|
|
@ -11,9 +11,6 @@ kde.package {
|
|||
(libcanberra.override { gtk = null; })
|
||||
];
|
||||
|
||||
# Work around undefined reference to ‘openpty’ in kioslave/fish/fish.cpp.
|
||||
NIX_LDFLAGS = "-lutil";
|
||||
|
||||
meta = {
|
||||
license = "LGPL";
|
||||
kde.name = "kde-runtime";
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
|
||||
, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
|
||||
, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
|
||||
, phonon, xkeyboard_config
|
||||
, phonon, xkeyboard_config, kdepimlibs
|
||||
}:
|
||||
|
||||
kde.package {
|
||||
|
@ -13,12 +13,9 @@ kde.package {
|
|||
xorg.libpthreadstubs
|
||||
soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
|
||||
libusb python libqalculate akonadi perl consolekit phonon
|
||||
kdepimlibs
|
||||
];
|
||||
|
||||
# Workaround for undefined reference to ‘dlsym’ in
|
||||
# kwinglutils_funcs.cpp and ‘clock_gettime’ in kdm/backend/dm.c.
|
||||
NIX_LDFLAGS = "-ldl -lrt";
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
# Fix incorrect path to kde4-config.
|
||||
|
|
Loading…
Reference in a new issue