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

syncthing: don't import from pkgs (#27029)

This commit is contained in:
volth 2017-07-02 00:50:59 +00:00 committed by Jörg Thalheim
parent 5c45f341f1
commit 756e69bf97
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }: { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.14.30"; version = "0.14.30";
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
'' + 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/lib/systemd/system/syncthing-resume.service \ $out/lib/systemd/system/syncthing-resume.service \
--replace /usr/bin/pkill ${pkgs.procps}/bin/pkill --replace /usr/bin/pkill ${procps}/bin/pkill
substitute etc/linux-systemd/system/syncthing@.service \ substitute etc/linux-systemd/system/syncthing@.service \
$out/lib/systemd/system/syncthing@.service \ $out/lib/systemd/system/syncthing@.service \