diff options
author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-12-28 00:02:44 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-12-28 18:40:21 +0200 |
commit | 919d44d29ffa5aa2ea499f97f1bf1a7009366fbc (patch) | |
tree | 798d23b8e5afe1db4a7a99dde5e4bb57c6a455fd /pkgs/tools/networking/openssh | |
parent | 93d8671e2c6d1d25f126ed30e5e6f16764330119 (diff) | |
download | nixlib-919d44d29ffa5aa2ea499f97f1bf1a7009366fbc.tar nixlib-919d44d29ffa5aa2ea499f97f1bf1a7009366fbc.tar.gz nixlib-919d44d29ffa5aa2ea499f97f1bf1a7009366fbc.tar.bz2 nixlib-919d44d29ffa5aa2ea499f97f1bf1a7009366fbc.tar.lz nixlib-919d44d29ffa5aa2ea499f97f1bf1a7009366fbc.tar.xz nixlib-919d44d29ffa5aa2ea499f97f1bf1a7009366fbc.tar.zst nixlib-919d44d29ffa5aa2ea499f97f1bf1a7009366fbc.zip |
openssh: Compile with '--with-pid-dir' to improve build purity
The configure script tries to probe whether /var/run exists when determining the location for the pid file, which is not very nice when doing chroot builds. Just set it explicitly to avoid the problem. For reference, the culprit in configure.ac: ```` piddir=/var/run if test ! -d $piddir ; then piddir=`eval echo ${sysconfdir}` case $piddir in NONE/*) piddir=`echo $piddir | sed "s~NONE~$ac_default_prefix~"` ;; esac fi AC_ARG_WITH([pid-dir], [ --with-pid-dir=PATH Specify location of ssh.pid file], ... ```` Also, use the `install-nokeys` target in installPhase so we avoid installing useless host keys into $out/etc/ssh and improve built purity as well.
Diffstat (limited to 'pkgs/tools/networking/openssh')
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 2004e453a0d9..67bf5be7d5b7 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" ]; |