diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2013-06-18 22:53:19 +0200 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2013-06-18 23:35:53 +0200 |
| commit | ae98b6185051ed0a5b7636dc85b696112910e1e8 (patch) | |
| tree | d49dc17a9b34834e42804da345e745c79746b2ea /pkgs/tools | |
| parent | f0417726d18aed5f2686fd684564c88ba0aa5b94 (diff) | |
| download | nixlib-ae98b6185051ed0a5b7636dc85b696112910e1e8.tar nixlib-ae98b6185051ed0a5b7636dc85b696112910e1e8.tar.gz nixlib-ae98b6185051ed0a5b7636dc85b696112910e1e8.tar.bz2 nixlib-ae98b6185051ed0a5b7636dc85b696112910e1e8.tar.lz nixlib-ae98b6185051ed0a5b7636dc85b696112910e1e8.tar.xz nixlib-ae98b6185051ed0a5b7636dc85b696112910e1e8.tar.zst nixlib-ae98b6185051ed0a5b7636dc85b696112910e1e8.zip | |
dropbear: update to 2013.58, and build dynamically
I had to do a trick with GNU make, to allow it to find libs.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/dropbear/default.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index f42c8f7ebe9b..362e21a3fcff 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-0.52"; + name = "dropbear-2013.58"; src = fetchurl { - url = http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2; - sha256 = "1h84dwld8qm19m0a1zslm2ssz65nr93irw7p2h5fjrlh9ix74ywc"; + url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; + sha256 = "0m9fhabs78v35fhqmji5gkm66ahkyqbbdzmlmr9m7q8l3ndihrnq"; }; dontDisableStatic = enableStatic; @@ -15,6 +15,18 @@ stdenv.mkDerivation rec { 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 = [ # Allow sessions to inherit the PATH from the parent dropbear. # Otherwise they only get the usual /bin:/usr/bin kind of PATH |