public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Update kdepimlibs.

Browse Source 
* Remove unnecessary NIX_LDFLAGS hacks.

svn path=/nixpkgs/branches/kde-4.7/; revision=27887
This commit is contained in:
Eelco Dolstra 2011-07-21 19:16:21 +00:00
parent 489d1be918
commit aa6f8184b5
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/kde-4.7/default.nix
View File

@ -48,7 +48,7 @@ recurseIntoAttrs rec {
kdelibs = callPackage ./libs { }; kdelibs = callPackage ./libs { };
#kdepimlibs = callPackage ./pimlibs { }; kdepimlibs = callPackage ./pimlibs { };
### BASE ### BASE

12
pkgs/desktops/kde-4.7/pimlibs/default.nix
View File

@ -1,11 +1,13 @@
{ kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info { stdenv, kde, cmake, qt4, perl, boost, cyrus_sasl, gpgme, libical, openldap, shared_mime_info
, kdelibs, automoc4, akonadi, soprano}: , kdelibs, automoc4, akonadi, soprano, phonon, shared_desktop_ontologies, libxslt }:
kde.package { kde.package {
buildInputs = [ cmake automoc4 perl shared_mime_info ]; buildInputs =
propagatedBuildInputs = [ qt4 boost cyrus_sasl gpgme libical openldap kdelibs [ cmake kdelibs qt4 automoc4 phonon boost gpgme shared_mime_info
akonadi soprano ]; shared_desktop_ontologies soprano libical libxslt openldap
cyrus_sasl akonadi perl
];
meta = { meta = {
description = "KDE PIM libraries"; description = "KDE PIM libraries";

3
pkgs/desktops/kde-4.7/runtime.nix
View File

@ -11,9 +11,6 @@ kde.package {
(libcanberra.override { gtk = null; }) (libcanberra.override { gtk = null; })
]; ];
# Work around undefined reference to ‘openpty’ in kioslave/fish/fish.cpp.
NIX_LDFLAGS = "-lutil";
meta = { meta = {
license = "LGPL"; license = "LGPL";
kde.name = "kde-runtime"; kde.name = "kde-runtime";

7
pkgs/desktops/kde-4.7/workspace.nix
View File

@ -1,7 +1,7 @@
{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt { automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394 , xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit , libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
, phonon, xkeyboard_config , phonon, xkeyboard_config, kdepimlibs
}: }:
kde.package { kde.package {
@ -13,12 +13,9 @@ kde.package {
xorg.libpthreadstubs xorg.libpthreadstubs
soprano shared_desktop_ontologies lm_sensors pciutils libraw1394 soprano shared_desktop_ontologies lm_sensors pciutils libraw1394
libusb python libqalculate akonadi perl consolekit phonon 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 = preConfigure =
'' ''
# Fix incorrect path to kde4-config. # Fix incorrect path to kde4-config.