swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13705 from aneeshusa/use-bin-instead-of-sbin-for-openssh

Browse source 
openssh: use bin instead of sbin folder
This commit is contained in:
joachifm 2016-03-07 12:03:37 +00:00
parent 884627a6ef bb39304ce6
commit 453686a24a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -263,7 +263,7 @@ in
serviceConfig =
{ ExecStart =
"${cfgc.package}/sbin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
"${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
"-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
KillMode = "process";
} // (if cfg.startWhenNeeded then {

1
pkgs/tools/networking/openssh/default.nix
View file

@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
# I set --disable-strip because later we strip anyway. And it fails to strip
# properly when cross building.
configureFlags = [
"--sbindir=\${out}/bin"
"--localstatedir=/var"
"--with-pid-dir=/run"
"--with-mantype=man"