Update bitcoin to 0.3.21

svn path=/nixpkgs/trunk/; revision=27275
This commit is contained in:
Russell O'Connor 2011-05-17 11:34:18 +00:00
parent 0736b17460
commit aaa09472bc
3 changed files with 30 additions and 11 deletions

View File

@ -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 { stdenv.mkDerivation rec {
version = "0.3.20.2"; version = "0.3.21";
name = "bitcoin-${version}"; name = "bitcoin-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/bitcoin/Bitcoin/bitcoin-0.3.20/bitcoin-0.3.20.2-linux.tar.gz"; url = "mirror://sourceforge/project/bitcoin/Bitcoin/${name}/${name}-linux.tar.gz";
sha256 = "1maq75myqkyngfi9ngaw6kv6nfia5wsjj2zjhns75k3wxhmvgpw5"; sha256 = "0wa04v3v2p7z2hard1lcjma4isa6rjrrwy0vydyxb66vx69zsjby";
}; };
buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK ]; buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK miniupnpc ];
preConfigure = '' preConfigure = ''
cd src cd src
mkdir obj
mkdir obj/nogui
substituteInPlace makefile.unix \ substituteInPlace makefile.unix \
--replace "-Wl,-Bstatic" "" \ --replace "-Wl,-Bstatic" "" \
--replace "-Wl,-Bdynamic" "" \ --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 "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"; makefile = "makefile.unix";

View File

@ -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";
};
}

View File

@ -910,6 +910,8 @@ let
mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { };
miniupnpc = callPackage ../tools/networking/miniupnpc { };
miniupnpd = callPackage ../tools/networking/miniupnpd { }; miniupnpd = callPackage ../tools/networking/miniupnpd { };
minixml = callPackage ../development/libraries/minixml { }; minixml = callPackage ../development/libraries/minixml { };