diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-04-25 15:41:32 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2011-04-25 15:41:32 +0000 |
commit | 68cb3535e129ea1715fee68449e43fbeaa16f34a (patch) | |
tree | c2ae9d63c8b0850904d99543e711984b3a46305d /pkgs | |
parent | 06c5e488049869a90d1a19322b883c75b5232e41 (diff) | |
download | nixlib-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')
-rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 692643505e18..1e2d20c1edb5 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -8,11 +8,17 @@ stdenv.mkDerivation { sha256 = "015r3xdkjpqwcv4lvxavq0nybdpxhfjycqpzbx8agqd5sywkx3b0"; }; - buildInputs = [ flex cracklib ] + buildNativeInputs = [ flex ]; + buildInputs = [ cracklib ] ++ stdenv.lib.optional (stdenv.system != "armv5tel-linux" && stdenv.system != "mips64-linux") libxcrypt; + crossAttrs = { + # Skip libxcrypt cross-building, as it fails for mips and armv5tel + propagatedBuildInputs = [ flex.hostDrv cracklib.hostDrv ]; + }; + postInstall = '' mv -v $out/sbin/unix_chkpwd{,.orig} ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd 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 ""} ''; |