From aaa09472bc0943fee42b79763196b8730d69322e Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Tue, 17 May 2011 11:34:18 +0000
Subject: [PATCH] Update bitcoin to 0.3.21

svn path=/nixpkgs/trunk/; revision=27275
---
 pkgs/applications/misc/bitcoin/default.nix  | 16 +++++---------
 pkgs/tools/networking/miniupnpc/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/tools/networking/miniupnpc/default.nix

diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix
index 9c9b3599158..b8c47851922 100644
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@@ -1,28 +1,22 @@
-{ fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK }:
+{ fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK, miniupnpc }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.20.2";
+  version = "0.3.21";
   name = "bitcoin-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bitcoin/Bitcoin/bitcoin-0.3.20/bitcoin-0.3.20.2-linux.tar.gz";
-    sha256 = "1maq75myqkyngfi9ngaw6kv6nfia5wsjj2zjhns75k3wxhmvgpw5";
+    url = "mirror://sourceforge/project/bitcoin/Bitcoin/${name}/${name}-linux.tar.gz";
+    sha256 = "0wa04v3v2p7z2hard1lcjma4isa6rjrrwy0vydyxb66vx69zsjby";
   };
 
-  buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK ];
+  buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK miniupnpc ];
 
   preConfigure = ''
     cd src
-    mkdir obj
-    mkdir obj/nogui
     substituteInPlace makefile.unix \
       --replace "-Wl,-Bstatic" "" \
       --replace "-Wl,-Bdynamic" "" \
-      --replace "-mt \\" " \\" \
-      --replace "-l wx_gtk2ud-2.9" "-l wx_gtk2u_core-2.9 -l wx_gtk2u_html-2.9 -l wx_gtk2u_adv-2.9" \
       --replace "DEBUGFLAGS=-g -D__WXDEBUG__" "DEBUGFLAGS=" \
-      --replace "/usr/local/include/wx-2.9" "${wxGTK}/include/wx-2.9" \
-      --replace "/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9" "${wxGTK}/lib/wx/include/gtk2-unicode-release-2.9"
   '';
 
   makefile = "makefile.unix";
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
new file mode 100644
index 00000000000..19ef811713a
--- /dev/null
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "miniupnpc-1.5";
+
+  src = fetchurl {
+    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    sha256 = "0mx950lfxcjpsfny8qcjx6phb74v4zw1rlj99xicd4icx5j0w3s4";
+  };
+
+  installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
+
+  postInstall =
+    ''
+      ensureDir $out/share/man/man3
+      cp man3/miniupnpc.3 $out/share/man/man3/
+    '';
+
+  meta = {
+    homepage = http://miniupnp.free.fr/;
+    description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0ef803d18e..1878d311e5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -910,6 +910,8 @@ let
 
   mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { };
 
+  miniupnpc = callPackage ../tools/networking/miniupnpc { };
+
   miniupnpd = callPackage ../tools/networking/miniupnpd { };
 
   minixml = callPackage ../development/libraries/minixml { };