summary refs log tree commit diff
path: root/pkgs/tools/networking/openssh
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2016-07-15 12:41:56 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-07-15 12:42:37 +0200
commit2ad0a84751c64ca30e06ea3d591660b841a3778f (patch)
treed4fab2356042becc7ac7b41707f3eae5b968f3de /pkgs/tools/networking/openssh
parentcfb4a19f51b5c1a5ce1138cf0ec44c917706e430 (diff)
downloadnixlib-2ad0a84751c64ca30e06ea3d591660b841a3778f.tar
nixlib-2ad0a84751c64ca30e06ea3d591660b841a3778f.tar.gz
nixlib-2ad0a84751c64ca30e06ea3d591660b841a3778f.tar.bz2
nixlib-2ad0a84751c64ca30e06ea3d591660b841a3778f.tar.lz
nixlib-2ad0a84751c64ca30e06ea3d591660b841a3778f.tar.xz
nixlib-2ad0a84751c64ca30e06ea3d591660b841a3778f.tar.zst
nixlib-2ad0a84751c64ca30e06ea3d591660b841a3778f.zip
Revert "openssh: Use the default privilege separation dir (/var/empty)"
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
Diffstat (limited to 'pkgs/tools/networking/openssh')
-rw-r--r--pkgs/tools/networking/openssh/default.nix5
1 files changed, 5 insertions, 0 deletions
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 = ''