Author: eelco
Date: Thu Jul 21 19:16:21 2011
New Revision: 27887
URL: https://svn.nixos.org/websvn/nix/?rev=27887&sc=1
Log:
* Update kdepimlibs.
* Remove unnecessary NIX_LDFLAGS hacks.
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/runtime.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Thu Jul 21
18:40:24 2011 (r27886)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Thu Jul 21
19:16:21 2011 (r27887)
@@ -48,7 +48,7 @@
kdelibs = callPackage ./libs { };
- #kdepimlibs = callPackage ./pimlibs { };
+ kdepimlibs = callPackage ./pimlibs { };
### BASE
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs/default.nix Thu Jul
21 18:40:24 2011 (r27886)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pimlibs/default.nix Thu Jul
21 19:16:21 2011 (r27887)
@@ -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";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/runtime.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/runtime.nix Thu Jul 21
18:40:24 2011 (r27886)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/runtime.nix Thu Jul 21
19:16:21 2011 (r27887)
@@ -11,9 +11,6 @@
(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";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix Thu Jul
21 18:40:24 2011 (r27886)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/workspace.nix Thu Jul
21 19:16:21 2011 (r27887)
@@ -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 @@
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.
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
