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

syncthing: correct path for systemd units

Browse Source 
The systemd files included with syncthing are "library" and not
"configuration" units, so they should be placed in lib/systemd
rather than etc/systemd, so that they can be customised by creating
unit files in etc/. This also corresponds to how syncthing's own
build script installs them.
This commit is contained in:
Linus Heckemann 2017-05-09 13:58:17 +01:00
parent 8584a16922
commit adf76dbc54
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/syncthing/default.nix
View File

@ -25,20 +25,20 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/etc/systemd/{system,user} mkdir -p $out/bin $out/lib/systemd/{system,user}
cp bin/* $out/bin cp bin/* $out/bin
'' + lib.optionalString (stdenv.isLinux) '' '' + lib.optionalString (stdenv.isLinux) ''
substitute etc/linux-systemd/system/syncthing-resume.service \ 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 --replace /usr/bin/pkill ${pkgs.procps}/bin/pkill
substitute etc/linux-systemd/system/syncthing@.service \ 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 --replace /usr/bin/syncthing $out/bin/syncthing
substitute etc/linux-systemd/user/syncthing.service \ 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 --replace /usr/bin/syncthing $out/bin/syncthing
''; '';

6
pkgs/applications/networking/syncthing/inotify.nix
View File

@ -16,14 +16,14 @@ buildGoPackage rec {
goDeps = ./inotify-deps.nix; goDeps = ./inotify-deps.nix;
postInstall = '' postInstall = ''
mkdir -p $bin/etc/systemd/{system,user} mkdir -p $bin/lib/systemd/{system,user}
substitute $src/etc/linux-systemd/system/syncthing-inotify@.service \ 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 --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ 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 --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''
install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify