public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dropbear: update to 2013.58, and build dynamically

Browse Source 
I had to do a trick with GNU make, to allow it to find libs.
This commit is contained in:
Lluís Batlle i Rossell 2013-06-18 22:53:19 +02:00
parent f0417726d1
commit ae98b61850
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/networking/dropbear/default.nix
View File

@ -2,11 +2,11 @@
sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dropbear-0.52"; name = "dropbear-2013.58";
src = fetchurl { src = fetchurl {
url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2; url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
sha256 = "1h84dwld8qm19m0a1zslm2ssz65nr93irw7p2h5fjrlh9ix74ywc"; sha256 = "0m9fhabs78v35fhqmji5gkm66ahkyqbbdzmlmr9m7q8l3ndihrnq";
}; };
dontDisableStatic = enableStatic; dontDisableStatic = enableStatic;
@ -15,6 +15,18 @@ stdenv.mkDerivation rec {
CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\""; CFLAGS = "-DSFTPSERVER_PATH=\\\"${sftpPath}\\\"";
# http://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html
preConfigure = ''
makeFlags=VPATH=`cat $NIX_GCC/nix-support/orig-libc`/lib
'';
crossAttrs = {
# This works for uclibc, at least.
preConfigure = ''
makeFlags=VPATH=`cat ${stdenv.gccCross}/nix-support/orig-libc`/lib
'';
};
patches = [ patches = [
# Allow sessions to inherit the PATH from the parent dropbear. # Allow sessions to inherit the PATH from the parent dropbear.
# Otherwise they only get the usual /bin:/usr/bin kind of PATH # Otherwise they only get the usual /bin:/usr/bin kind of PATH

5
pkgs/top-level/all-packages.nix
View File

@ -725,10 +725,7 @@ let
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
dropbear = callPackage ../tools/networking/dropbear { dropbear = callPackage ../tools/networking/dropbear { };
enableStatic = true;
zlib = zlibStatic;
};
dtach = callPackage ../tools/misc/dtach { }; dtach = callPackage ../tools/misc/dtach { };