summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-12-28 21:49:36 +0100
committerPeter Simons <simons@cryp.to>2015-12-28 21:49:36 +0100
commitf3aa927b7006ba07b78fe38fe272bfa9f5d4c47d (patch)
treea9bffde4a0e4fd24cc7dac5ba212b928a64d668e /pkgs
parent35780cc1546c12786f01c28112445d08a4c1eef1 (diff)
parent919d44d29ffa5aa2ea499f97f1bf1a7009366fbc (diff)
downloadnixpkgs-f3aa927b7006ba07b78fe38fe272bfa9f5d4c47d.tar
nixpkgs-f3aa927b7006ba07b78fe38fe272bfa9f5d4c47d.tar.gz
nixpkgs-f3aa927b7006ba07b78fe38fe272bfa9f5d4c47d.tar.bz2
nixpkgs-f3aa927b7006ba07b78fe38fe272bfa9f5d4c47d.tar.lz
nixpkgs-f3aa927b7006ba07b78fe38fe272bfa9f5d4c47d.tar.xz
nixpkgs-f3aa927b7006ba07b78fe38fe272bfa9f5d4c47d.tar.zst
nixpkgs-f3aa927b7006ba07b78fe38fe272bfa9f5d4c47d.zip
Merge pull request #11991 from dezgeg/pr-openssh-purity
openssh: Compile with '--with-pid-dir' to improve build purity
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/networking/openssh/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 2004e453a0d..67bf5be7d5b 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
   # properly when cross building.
   configureFlags = [
     "--localstatedir=/var"
+    "--with-pid-dir=/run"
     "--with-mantype=man"
     "--with-libedit=yes"
     "--disable-strip"
@@ -61,6 +62,7 @@ stdenv.mkDerivation rec {
     cp contrib/ssh-copy-id.1 $out/share/man/man1/
   '';
 
+  installTargets = [ "install-nokeys" ];
   installFlags = [
     "sysconfdir=\${out}/etc/ssh"
   ];