diff --git a/pkgs/desktops/kde-4.5/base-runtime/default.nix b/pkgs/desktops/kde-4.5/base-runtime/default.nix new file mode 100644 index 00000000000..35466b4b624 --- /dev/null +++ b/pkgs/desktops/kde-4.5/base-runtime/default.nix @@ -0,0 +1,25 @@ +{ kdePackage, cmake, perl, bzip2, xz, qt4, alsaLib, xineLib, samba, + shared_mime_info, exiv2, libssh , kdelibs, automoc4, strigi, soprano, + cluceneCore, attica, virtuoso, makeWrapper }: + +kdePackage { + pn = "kdebase-runtime"; + v = "4.5.0"; + + buildInputs = [ cmake perl bzip2 xz qt4 alsaLib xineLib samba shared_mime_info + exiv2 libssh kdelibs automoc4 strigi soprano cluceneCore attica + makeWrapper]; + + patches = [ ./freeze.diff ]; + + postInstall = '' + wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \ + --prefix PATH : "${virtuoso}/bin" + ''; + + meta = { + description = "KDE runtime"; + longDescription = "Libraries and tools which supports running KDE desktop applications"; + license = "LGPL"; + }; +} diff --git a/pkgs/desktops/kde-4.5/base-runtime/freeze.diff b/pkgs/desktops/kde-4.5/base-runtime/freeze.diff new file mode 100644 index 00000000000..62079f6e8ce --- /dev/null +++ b/pkgs/desktops/kde-4.5/base-runtime/freeze.diff @@ -0,0 +1,37 @@ +Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp +=================================================================== +--- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp (revision 1160390) ++++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.cpp (revision 1160391) +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + + #include +@@ -60,6 +61,11 @@ + + void UpnpNetworkBuilder::start() + { ++ QTimer::singleShot(0, this, SLOT(startBrowse())); ++} ++ ++void UpnpNetworkBuilder::startBrowse() ++{ + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + +Index: kioslave/network/network/builder/upnp/upnpnetworkbuilder.h +=================================================================== +--- a/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h (revision 1160390) ++++ b/kioslave/network/network/builder/upnp/upnpnetworkbuilder.h (revision 1160391) +@@ -63,6 +63,8 @@ + void removeUPnPDevices( const QList& devices ); + + private Q_SLOTS: ++ void startBrowse(); ++ + void onDevicesAdded( const DeviceTypeMap& deviceTypeMap ); + void onDevicesRemoved( const DeviceTypeMap& deviceTypeMap ); + void onAddedDeviceDetails( const Cagibi::Device& device ); diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index e3a52ab861a..ad2b2684c6d 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -40,6 +40,8 @@ kdebase_workspace = callPackage ./base-workspace { }; + kdebase_runtime = callPackage ./base-runtime { }; + kdeartwork = callPackage ./artwork { }; ### DEVELOPMENT