summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorRussell O'Connor <roconnor@theorem.ca>2011-05-17 11:34:18 +0000
committerRussell O'Connor <roconnor@theorem.ca>2011-05-17 11:34:18 +0000
commitaaa09472bc0943fee42b79763196b8730d69322e (patch)
tree66959aa1d8d8e2ee763ad4d905d119f040cc273c /pkgs/applications/misc
parent0736b17460f462642a70ef608f150f1c19c0aec7 (diff)
downloadnixpkgs-aaa09472bc0943fee42b79763196b8730d69322e.tar
nixpkgs-aaa09472bc0943fee42b79763196b8730d69322e.tar.gz
nixpkgs-aaa09472bc0943fee42b79763196b8730d69322e.tar.bz2
nixpkgs-aaa09472bc0943fee42b79763196b8730d69322e.tar.lz
nixpkgs-aaa09472bc0943fee42b79763196b8730d69322e.tar.xz
nixpkgs-aaa09472bc0943fee42b79763196b8730d69322e.tar.zst
nixpkgs-aaa09472bc0943fee42b79763196b8730d69322e.zip
Update bitcoin to 0.3.21
svn path=/nixpkgs/trunk/; revision=27275
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/bitcoin/default.nix16
1 files changed, 5 insertions, 11 deletions
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";