Merge pull request #2032 from the-kenny/fix-udisks1

Fix services.udisks.enable = true

nixos/modules/services/hardware/udisks.nix

@@ -40,6 +40,8 @@ with pkgs.lib;
       '';
 
     services.udev.packages = [ pkgs.udisks ];
+
+    systemd.packages = [ pkgs.udisks ];
   };
 
 }

pkgs/os-specific/linux/udisks/1-default.nix

@@ -19,6 +19,11 @@ 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 =