about summary refs log tree commit diff
path: root/pkgs/tools/networking/openssh
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2011-04-25 15:41:32 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2011-04-25 15:41:32 +0000
commit68cb3535e129ea1715fee68449e43fbeaa16f34a (patch)
treec2ae9d63c8b0850904d99543e711984b3a46305d /pkgs/tools/networking/openssh
parent06c5e488049869a90d1a19322b883c75b5232e41 (diff)
downloadnixlib-68cb3535e129ea1715fee68449e43fbeaa16f34a.tar
nixlib-68cb3535e129ea1715fee68449e43fbeaa16f34a.tar.gz
nixlib-68cb3535e129ea1715fee68449e43fbeaa16f34a.tar.bz2
nixlib-68cb3535e129ea1715fee68449e43fbeaa16f34a.tar.lz
nixlib-68cb3535e129ea1715fee68449e43fbeaa16f34a.tar.xz
nixlib-68cb3535e129ea1715fee68449e43fbeaa16f34a.tar.zst
nixlib-68cb3535e129ea1715fee68449e43fbeaa16f34a.zip
Making openssh cross-build. And making linux-pam almost cross-build, I think.
This allows me to put sftp-server in the nanonote and use it through dropbear.


svn path=/nixpkgs/trunk/; revision=26971
Diffstat (limited to 'pkgs/tools/networking/openssh')
-rw-r--r--pkgs/tools/networking/openssh/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 8c98297bd56a..c77fe53a56bf 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -28,12 +28,16 @@ stdenv.mkDerivation rec {
     
   patches = [ ./locale_archive.patch ];
 
-  buildInputs = [ zlib openssl perl libedit pkgconfig pam ];
+  buildNativeInptus = [ perl ];
+  buildInputs = [ zlib openssl libedit pkgconfig pam ];
 
+  # I set --disable-strip because later we strip anyway. And it fails to strip
+  # properly when cross building.
   configureFlags =
     ''
       --with-mantype=man
       --with-libedit=yes
+      --disable-strip
       ${if pam != null then "--with-pam" else "--without-pam"}
       ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
     '';