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

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

Fix services.udisks.enable = true
This commit is contained in:
Peter Simons 2014-03-26 11:20:26 +01:00
parent 0cbf18a1c2 02a30bea44
commit cda8eb03a2
2 changed files with 7 additions and 0 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,6 +40,8 @@ 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,6 +19,11 @@ 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 =