mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-31 14:41:27 +00:00
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
This commit is contained in:
parent
06c5e48804
commit
68cb3535e1
@ -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
|
||||
|
@ -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 ""}
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user