From 41c8f9598ede18fe2185a922be4730cbe8530843 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 27 Oct 2013 23:36:41 +0100
Subject: [PATCH] Remove dead code

---
 nixos/modules/services/system/dbus.nix | 37 +-------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index eab876be76d..196fa40c551 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -122,7 +122,7 @@ in
         [Socket]
         ListenStream=/var/run/dbus/system_bus_socket
       '';
-      
+
     systemd.units."dbus.service".text =
       ''
         [Unit]
@@ -137,41 +137,6 @@ in
         OOMScoreAdjust=-900
       '';
 
-    /*
-    jobs.dbus =
-      { startOn = "started udev and started syslogd";
-      
-        restartIfChanged = false;
-        
-        path = [ pkgs.dbus_daemon pkgs.dbus_tools ];
-
-        preStart =
-          ''
-            mkdir -m 0755 -p ${homeDir}
-            chown messagebus ${homeDir}
-
-            mkdir -m 0755 -p /var/lib/dbus
-            dbus-uuidgen --ensure
-
-            rm -f ${homeDir}/pid
-          '';
-
-        daemonType = "fork";
-
-        exec = "dbus-daemon --system";
-
-        postStop =
-          ''
-            # !!! Hack: doesn't belong here.
-            pid=$(cat /var/run/ConsoleKit/pid || true)
-            if test -n "$pid"; then
-                kill $pid || true
-                rm -f /var/run/ConsoleKit/pid
-            fi
-          '';
-      };
-    */    
-
     security.setuidOwners = singleton
       { program = "dbus-daemon-launch-helper";
         source = "${pkgs.dbus_daemon}/libexec/dbus-daemon-launch-helper";