diff --git a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix b/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
index b8a4a21cc73..deb90574e32 100644
--- a/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix
@@ -1,5 +1,5 @@
-{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica,
-  libcanberra, virtuoso, makeWrapper, samba
+{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica
+, libcanberra, virtuoso, makeWrapper, samba
 }:
 
 # TODO: Re-enable ntrack once it is fixed upstream
@@ -10,12 +10,6 @@ kde {
       makeWrapper samba (libcanberra.override { gtk = null; })
     ];
 
-# Copied from kde45, Nepomuk needs it.
-  postInstall = ''
-    wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
-        --prefix PATH : "${virtuoso}/bin"
-  '';
-
   meta = {
     license = "LGPL";
   };
diff --git a/pkgs/desktops/kde-4.7/kdepim.nix b/pkgs/desktops/kde-4.7/kdepim.nix
index c21e8c112a8..9b95d491a44 100644
--- a/pkgs/desktops/kde-4.7/kdepim.nix
+++ b/pkgs/desktops/kde-4.7/kdepim.nix
@@ -3,8 +3,10 @@
 
 kde {
 
-  buildInputs = [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
-    libxslt cyrus_sasl gpgme libassuan grantlee ];
+  buildInputs =
+    [ kdepimlibs boost akonadi shared_desktop_ontologies libxml2
+      libxslt cyrus_sasl gpgme libassuan grantlee
+    ];
 
   passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
 
diff --git a/pkgs/desktops/kde-4.7/kdepimlibs.nix b/pkgs/desktops/kde-4.7/kdepimlibs.nix
index c1e22427ac7..736508eaf0f 100644
--- a/pkgs/desktops/kde-4.7/kdepimlibs.nix
+++ b/pkgs/desktops/kde-4.7/kdepimlibs.nix
@@ -2,8 +2,10 @@
 , kdelibs, akonadi, shared_desktop_ontologies, libxml2, libxslt, prison }:
 
 kde {
-  buildInputs = [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
-    openldap cyrus_sasl akonadi prison ];
+  buildInputs =
+    [ boost gpgme shared_desktop_ontologies libical libxml2 libxslt
+      openldap cyrus_sasl akonadi prison
+    ];
 
   propagatedBuildInputs = [ kdelibs ];
 
diff --git a/pkgs/desktops/kde-4.7/support/soprano/default.nix b/pkgs/desktops/kde-4.7/support/soprano/default.nix
index baed2233152..dbb6773f890 100644
--- a/pkgs/desktops/kde-4.7/support/soprano/default.nix
+++ b/pkgs/desktops/kde-4.7/support/soprano/default.nix
@@ -8,11 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1ki92wg0i9nhn1fh5mdcls5h9h3lf2k5r66snsags4x7zw0dmv2z";
   };
 
-  patches = [ (fetchurl {
-    url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
-    name = "soprano-virtuoso-restart.patch";
-    sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
-  })];
+  patches =
+    [ (fetchurl {
+        url = https://git.reviewboard.kde.org/r/102466/diff/raw/;
+        name = "soprano-virtuoso-restart.patch";
+        sha256 = "0jk038fp7ii6847mbxdajhhc7f6ap6lriaklxcqqxf6ddj37gf3y";
+      })
+    ];
 
   # We disable the Java backend, since we do not need them and they make the closure size much bigger
   buildInputs = [ cmake qt4 clucene_core librdf_redland libiodbc ];
diff --git a/pkgs/servers/sql/virtuoso/default.nix b/pkgs/servers/sql/virtuoso/default.nix
index 20c3d1f2cf9..31dcc842a19 100644
--- a/pkgs/servers/sql/virtuoso/default.nix
+++ b/pkgs/servers/sql/virtuoso/default.nix
@@ -4,15 +4,15 @@ stdenv.mkDerivation rec {
   name = "virtuoso-opensource-6.1.3";
 
   src = fetchurl {
-    url = "mirror://sf/virtuoso/${name}.tar.gz";
+    url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
     sha256 = "0rj629qjsibpllazngbhzhsh90x6nidpn292qz1xdvirwvb2h3s2";
   };
 
   buildInputs = [ libxml2 openssl readline gawk ];
 
-  CPP="${stdenv.gcc}/bin/gcc -E";
+  CPP = "${stdenv.gcc}/bin/gcc -E";
 
-  configureFlags="
+  configureFlags = "
     --enable-shared --disable-all-vads --with-readline=${readline}
     --disable-hslookup --disable-wbxml2 --without-iodbc
     --enable-openssl=${openssl}