about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/tools/networking/openssh/builder.sh10
-rw-r--r--pkgs/tools/networking/openssh/default.nix1
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/networking/openssh/builder.sh b/pkgs/tools/networking/openssh/builder.sh
index f9fc634dce9b6..0573f1c6d672d 100644
--- a/pkgs/tools/networking/openssh/builder.sh
+++ b/pkgs/tools/networking/openssh/builder.sh
@@ -1,9 +1,13 @@
 . $stdenv/setup
 
+
 configureFlags="--with-privsep-path=$out/empty"
  
-genericBuild
+postInstall() {
+   rm $out/etc/ssh_host_dsa_key $out/etc/ssh_host_dsa_key.pub $out/etc/ssh_host_key $out/etc/ssh_host_key.pub $out/etc/ssh_host_rsa_key $out/etc/ssh_host_rsa_key.pub
 
-rm $out/etc/ssh_host_dsa_key $out/etc/ssh_host_dsa_key.pub $out/etc/ssh_host_key $out/etc/ssh_host_key.pub $out/etc/ssh_host_rsa_key $out/etc/ssh_host_rsa_key.pub
+   chmod +r $out/libexec/ssh-keysign
+}
+#postInstall=postInstall
 
-chmod +r $out/libexec/ssh-keysign
+genericBuild
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index f5ca543f70b0f..d8194ccb63be9 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -10,4 +10,5 @@ stdenv.mkDerivation {
   };
  
   buildInputs = [zlib openssl];
+  patches = [./openssh-no-host-key.patch];
 }