diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-02-21 16:03:34 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-02-21 16:03:34 +0000 |
| commit | e6744d0f893e0641b22996382cc6dcb81f8acc3d (patch) | |
| tree | ba656c68d6348d24c4814a6da79bb204e06ff2d7 /pkgs/tools/networking/openssh | |
| parent | cdaecff49f9b06d74de87e217659c13b2b2bba98 (diff) | |
| parent | 8125cd8915a1601280327503ce3ac14e0a356771 (diff) | |
| download | nixlib-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar nixlib-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.gz nixlib-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.bz2 nixlib-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.lz nixlib-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.xz nixlib-e6744d0f893e0641b22996382cc6dcb81f8acc3d.tar.zst nixlib-e6744d0f893e0641b22996382cc6dcb81f8acc3d.zip | |
* Merge diff between trunk/pkgs@1646 and branches/nixos-pkgs@2256;
this contains mostly Armijn's pure stdenv-linux. * After unpacking the statically linked GCC, patch all store paths to /nix/store/ffffffffffffffffffffffffffffffff. Ugly hack to prevent undeclared references but it works. * We don't need Glib's dynamic libraries in the first bootstrap stage; delete them. Actually the downloaded Glibc binary is only needed for building Glibc, since GCC needs a C compiler to build some programs in `configure'. So static linking is fine for that. Maybe it would be better to patch `configure' so that we don't need a pre-built Glibc at all. * Set the svn:executable property on `cp' and `patchelf'. * In Glibc, revert to LinuxThreads. Maybe NPTL will work, but TLS support is a problem. * Delete most Glibc patches; they're no longer needed since the branch updated it to 20050110. * Some cleanups. svn path=/nixpkgs/trunk/; revision=2258
Diffstat (limited to 'pkgs/tools/networking/openssh')
| -rw-r--r-- | pkgs/tools/networking/openssh/builder.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/networking/openssh/builder.sh b/pkgs/tools/networking/openssh/builder.sh index f9fc634dce9b..d5d4cb6a1cc6 100644 --- a/pkgs/tools/networking/openssh/builder.sh +++ b/pkgs/tools/networking/openssh/builder.sh @@ -1,9 +1,11 @@ . $stdenv/setup + configureFlags="--with-privsep-path=$out/empty" -genericBuild +installPhase() { + make install-nokeys +} +installPhase=installPhase -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 +genericBuild |