summary refs log tree commit diff
path: root/pkgs/os-specific/linux/udisks
diff options
context:
space:
mode:
authorMoritz Ulrich <moritz@tarn-vedra.de>2014-03-25 16:48:19 +0100
committerMoritz Ulrich <moritz@tarn-vedra.de>2014-03-25 16:52:45 +0100
commit02a30bea44edf1116dcab16c5e64501312b2927b (patch)
tree341f301b15062bf59ad827b932fc5342af963f77 /pkgs/os-specific/linux/udisks
parentaf89e63bf73f43b094958c2b744ada1731d37f8a (diff)
downloadnixlib-02a30bea44edf1116dcab16c5e64501312b2927b.tar
nixlib-02a30bea44edf1116dcab16c5e64501312b2927b.tar.gz
nixlib-02a30bea44edf1116dcab16c5e64501312b2927b.tar.bz2
nixlib-02a30bea44edf1116dcab16c5e64501312b2927b.tar.lz
nixlib-02a30bea44edf1116dcab16c5e64501312b2927b.tar.xz
nixlib-02a30bea44edf1116dcab16c5e64501312b2927b.tar.zst
nixlib-02a30bea44edf1116dcab16c5e64501312b2927b.zip
Fix services.udisks.enable.
Latest update to udisks in 344f2e65 broke it for me. Fix it by doing the
following:

- Add udisks.service to /etc/systemd/system (via systemd.packages)
- Fix path to udisks-daemon in udisks.service (libexec/ instead of lib/)
Diffstat (limited to 'pkgs/os-specific/linux/udisks')
-rw-r--r--pkgs/os-specific/linux/udisks/1-default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix
index 19cfec9f0657..485880f0cbb9 100644
--- a/pkgs/os-specific/linux/udisks/1-default.nix
+++ b/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 =