From 2ba552fb2e7745ddbc52001208f89f7f82310251 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Apr 2014 13:27:51 +0200
Subject: [PATCH] Revert "Fix services.udisks.enable."

This reverts commit 02a30bea44edf1116dcab16c5e64501312b2927b,
necessary after reverting to udisks 1.0.4.

http://hydra.nixos.org/build/10194840
---
 nixos/modules/services/hardware/udisks.nix  | 2 --
 pkgs/os-specific/linux/udisks/1-default.nix | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/nixos/modules/services/hardware/udisks.nix b/nixos/modules/services/hardware/udisks.nix
index a3527468cce6..531ee192573a 100644
--- a/nixos/modules/services/hardware/udisks.nix
+++ b/nixos/modules/services/hardware/udisks.nix
@@ -40,8 +40,6 @@ with pkgs.lib;
       '';
 
     services.udev.packages = [ pkgs.udisks ];
-
-    systemd.packages = [ pkgs.udisks ];
   };
 
 }
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index 8c112417f0a3..09731d54ab75 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/pkgs/os-specific/linux/udisks/1-default.nix
@@ -19,11 +19,6 @@ stdenv.mkDerivation rec {
       substituteInPlace src/main.c --replace \
         "/sbin:/bin:/usr/sbin:/usr/bin" \
         "${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin"
-
-      # For some reason @libexec@ is set to 'lib/' when building.
-      # Passing --libexecdir in configureFlags didn't help.
-      substituteInPlace data/systemd/udisks.service.in \
-        --replace "@libexecdir@" "$out/libexec"
     '';
 
   buildInputs =