diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 05e62ba38446..bd86501c30e2 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -12,5 +12,6 @@ stdenv.mkDerivation rec {
     license = "GPL";
     homepage = http://www.krusader.org;
     maintainers = with stdenv.lib.maintainers; [ sander urkud ];
+    inherit (kdelibs.meta) platforms;
   };
 }
diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix
index 10a590e941b4..7761c45850ec 100644
--- a/pkgs/applications/version-management/kdesvn/default.nix
+++ b/pkgs/applications/version-management/kdesvn/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, lib, cmake, qt4, perl, gettext, apr, aprutil, subversion, db4
-, kdelibs, automoc4, phonon, kde_baseapps }:
+{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "kdesvn-1.5.5";
+
   src = fetchurl {
-    url = http://kdesvn.alwins-world.de/downloads/kdesvn-1.5.5.tar.bz2;
+    url = "${meta.homepage}/downloads/${name}.tar.bz2";
     sha256 = "02sb34p04dyd88ksxvpiffhxqwmhs3yv1wif9m8w0fly9hvy1zk7";
   };
 
@@ -12,15 +12,18 @@ stdenv.mkDerivation {
     sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
   '';
 
-  patches = [ ./docbook.patch ];
+  patches = [ ./docbook.patch ./virtual_inheritance.patch ];
   
 
-  buildInputs = [ cmake qt4 perl gettext apr aprutil subversion db4 kdelibs automoc4 phonon ];
+  buildInputs = [ apr aprutil subversion db4 kdelibs ];
+
+  buildNativeInputs = [ gettext ];
 
   meta = {
     description = "KDE SVN front-end";
     license = "GPL";
     homepage = http://kdesvn.alwins-world.de;
-    maintainers = [ lib.maintainers.sander ];
+    maintainers = [ stdenv.lib.maintainers.sander ];
+    inherit (kdelibs.meta) platforms;
   };
 }
diff --git a/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch
new file mode 100644
index 000000000000..faaf6afcd6ba
--- /dev/null
+++ b/pkgs/applications/version-management/kdesvn/virtual_inheritance.patch
@@ -0,0 +1,11 @@
+--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
++++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
+@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
+ /**
+ 	@author Rajko Albrecht <ral@alwins-world.de>
+ */
+-class RevGraphView : virtual public QGraphicsView
++class RevGraphView : public QGraphicsView
+ {
+     Q_OBJECT
+ public: