diff options
author | Peter Hoeg <peter@speartail.com> | 2017-05-09 22:16:13 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-09 22:16:13 +0800 |
commit | 50711091f83e0ab60ce86698b4bfad952beb4184 (patch) | |
tree | 2a1f525d7a0717a2636a3fdbb2a862034b8ee19b | |
parent | 8584a169220a91791158c49e0021ca330092c712 (diff) | |
parent | adf76dbc54c12ceda32cd19ab3b408d59ad70902 (diff) | |
download | nixlib-50711091f83e0ab60ce86698b4bfad952beb4184.tar nixlib-50711091f83e0ab60ce86698b4bfad952beb4184.tar.gz nixlib-50711091f83e0ab60ce86698b4bfad952beb4184.tar.bz2 nixlib-50711091f83e0ab60ce86698b4bfad952beb4184.tar.lz nixlib-50711091f83e0ab60ce86698b4bfad952beb4184.tar.xz nixlib-50711091f83e0ab60ce86698b4bfad952beb4184.tar.zst nixlib-50711091f83e0ab60ce86698b4bfad952beb4184.zip |
Merge pull request #25643 from lheckemann/syncthing-systemd-path
syncthing: correct path for systemd units
-rw-r--r-- | pkgs/applications/networking/syncthing/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/networking/syncthing/inotify.nix | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index f90e30c61bbc..5462c8bacdde 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -25,20 +25,20 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin $out/etc/systemd/{system,user} + mkdir -p $out/bin $out/lib/systemd/{system,user} cp bin/* $out/bin '' + lib.optionalString (stdenv.isLinux) '' substitute etc/linux-systemd/system/syncthing-resume.service \ - $out/etc/systemd/system/syncthing-resume.service \ + $out/lib/systemd/system/syncthing-resume.service \ --replace /usr/bin/pkill ${pkgs.procps}/bin/pkill substitute etc/linux-systemd/system/syncthing@.service \ - $out/etc/systemd/system/syncthing@.service \ + $out/lib/systemd/system/syncthing@.service \ --replace /usr/bin/syncthing $out/bin/syncthing substitute etc/linux-systemd/user/syncthing.service \ - $out/etc/systemd/user/syncthing.service \ + $out/lib/systemd/user/syncthing.service \ --replace /usr/bin/syncthing $out/bin/syncthing ''; diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index db99a1aa1090..6e9c1ba10280 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -16,14 +16,14 @@ buildGoPackage rec { goDeps = ./inotify-deps.nix; postInstall = '' - mkdir -p $bin/etc/systemd/{system,user} + mkdir -p $bin/lib/systemd/{system,user} substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \ - $bin/etc/systemd/system/syncthing-inotify@.service \ + $bin/lib/systemd/system/syncthing-inotify@.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ - $bin/etc/systemd/user/syncthing-inotify.service \ + $bin/lib/systemd/user/syncthing-inotify.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify '' + stdenv.lib.optionalString stdenv.isDarwin '' install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify |