From 2ad0a84751c64ca30e06ea3d591660b841a3778f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 15 Jul 2016 12:41:56 +0200 Subject: [PATCH] Revert "openssh: Use the default privilege separation dir (/var/empty)" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a927709a35cee56f878f0f57a932e1a6e2ebe23b because it doesn't build: $ nix-build -A openssh ... mkdir /nix/store/yl2xap8n1by3dqxgc4rmrc4s753676a3-openssh-7.2p2/libexec (umask 022 ; ./mkinstalldirs /var/empty) mkdir /var mkdir: cannot create directory '/var': Permission denied mkdir /var/empty mkdir: cannot create directory '/var/empty': No such file or directory make: *** [Makefile:304: install-files] Error 1 builder for ‘/nix/store/ifygp4mqpv7l8cgp0njp8w7lmrl6brpp-openssh-7.2p2.drv’ failed with exit code 2 --- pkgs/tools/networking/openssh/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8d893c6a57fa..64b9fe98278b 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -66,6 +66,11 @@ stdenv.mkDerivation rec { ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; + preConfigure = '' + configureFlagsArray+=("--with-privsep-path=$out/empty") + mkdir -p $out/empty + ''; + enableParallelBuilding = true; postInstall = ''