public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix services.udisks.enable."

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

http://hydra.nixos.org/build/10194840
This commit is contained in:
Eelco Dolstra 2014-04-08 13:27:51 +02:00
parent 565ff3da00
commit 2ba552fb2e
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/hardware/udisks.nix
View File

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

5
pkgs/os-specific/linux/udisks/1-default.nix
View File

@ -19,11 +19,6 @@ stdenv.mkDerivation rec {
substituteInPlace src/main.c --replace \ substituteInPlace src/main.c --replace \
"/sbin:/bin:/usr/sbin:/usr/bin" \ "/sbin:/bin:/usr/sbin:/usr/bin" \
"${utillinux}/bin:${mdadm}/sbin:/var/run/current-system/sw/bin:/var/run/current-system/sw/sbin" "${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 = buildInputs =