diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix
index 41422c307e9..2f492833538 100644
--- a/nixos/modules/services/audio/slimserver.nix
+++ b/nixos/modules/services/audio/slimserver.nix
@@ -21,9 +21,9 @@ in {
 
       package = mkOption {
         type = types.package;
-	default = pkgs.slimserver;
-	defaultText = "pkgs.slimserver";
-	description = "Slimserver package to use.";
+        default = pkgs.slimserver;
+        defaultText = "pkgs.slimserver";
+        description = "Slimserver package to use.";
       };
 
       dataDir = mkOption {
@@ -84,9 +84,9 @@ in {
       groups.slimserver.gid = config.ids.gids.slimserver;
       users.slimserver = {
         uid = config.ids.uids.slimserver;
-	description = "Slimserver daemon user";
-	home = cfg.dataDir;
-	group = "slimserver";
+        description = "Slimserver daemon user";
+        home = cfg.dataDir;
+        group = "slimserver";
       };
     };
   };
diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 1d9a16656a7..bef55294424 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,5 +1,4 @@
 { stdenv, buildPerlPackage, fetchurl
-#, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file
 , perl, perlPackages }:
 
 buildPerlPackage rec {
@@ -62,6 +61,7 @@ buildPerlPackage rec {
 
   prePatch = ''
     mkdir CPAN_used
+    # slimserver doesn't work with current DBIx/SQL versions, use bundled copies
     mv CPAN/DBIx CPAN/SQL CPAN_used
     rm -rf CPAN
     rm -rf Bin