From ae98b6185051ed0a5b7636dc85b696112910e1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 18 Jun 2013 22:53:19 +0200
Subject: [PATCH] dropbear: update to 2013.58, and build dynamically

I had to do a trick with GNU make, to allow it to find libs.
---
 pkgs/tools/networking/dropbear/default.nix | 18 +++++++++++++++---
 pkgs/top-level/all-packages.nix            |  5 +----
 2 files changed, 16 insertions(+), 7 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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7e96565728e..f016b3e2816d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -725,10 +725,7 @@ let
 
   dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
 
-  dropbear = callPackage ../tools/networking/dropbear {
-    enableStatic = true;
-    zlib = zlibStatic;
-  };
+  dropbear = callPackage ../tools/networking/dropbear { };
 
   dtach = callPackage ../tools/misc/dtach { };