Author: roconnor
Date: Thu Nov 24 19:48:20 2011
New Revision: 30553
URL: https://nixos.org/websvn/nix/?rev=30553&sc=1
Log:
Updating bitcoin to version 0.5.0.
Modified:
nixpkgs/trunk/pkgs/applications/misc/bitcoin/default.nix
nixpkgs/trunk/pkgs/tools/networking/miniupnpc/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/misc/bitcoin/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/bitcoin/default.nix Thu Nov 24
19:43:03 2011 (r30552)
+++ nixpkgs/trunk/pkgs/applications/misc/bitcoin/default.nix Thu Nov 24
19:48:20 2011 (r30553)
@@ -1,32 +1,30 @@
-{ fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK,
miniupnpc }:
+{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
stdenv.mkDerivation rec {
- version = "0.3.24";
+ version = "0.5.0";
name = "bitcoin-${version}";
src = fetchurl {
- url =
"mirror://sourceforge/project/bitcoin/Bitcoin/${name}/${name}-src.tar.gz";
- sha256 = "18n8i37c478b275m2x82411i1fsw8l34qm1k65ynnw38fpaj4h3r";
+ url = " https://github.com/bitcoin/bitcoin/tarball/v${version}";;
+ sha256 = "146q0ijvdmk9iidmavzkpdgflnfi86ahqkwdvxpf5gmfqdd53yqx";
};
- buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK miniupnpc ];
+ buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
- preConfigure = ''
+ unpackCmd = "tar xvf $curSrc";
+
+ buildPhase = ''
+ qmake
+ make
cd src
- substituteInPlace makefile.unix \
- --replace "-Wl,-Bstatic" "" \
- --replace "-Wl,-Bdynamic" "" \
- --replace "DEBUGFLAGS=-g -D__WXDEBUG__" "DEBUGFLAGS=" \
+ make -f makefile.unix
+ cd ..
'';
- makefile = "makefile.unix";
-
- buildFlags = "bitcoin bitcoind";
-
installPhase = ''
ensureDir $out/bin
- cp bitcoin $out/bin
- cp bitcoind $out/bin
+ cp bitcoin-qt $out/bin
+ cp src/bitcoind $out/bin
'';
meta = {
Modified: nixpkgs/trunk/pkgs/tools/networking/miniupnpc/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/miniupnpc/default.nix Thu Nov 24
19:43:03 2011 (r30552)
+++ nixpkgs/trunk/pkgs/tools/networking/miniupnpc/default.nix Thu Nov 24
19:48:20 2011 (r30553)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
- name = "miniupnpc-1.5";
+ name = "miniupnpc-1.6";
src = fetchurl {
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";;
- sha256 = "0mx950lfxcjpsfny8qcjx6phb74v4zw1rlj99xicd4icx5j0w3s4";
+ sha256 = "151rh46axl44y7bbflb43pnj52gvlfnkxfgrn2jvai5gwrbbgmmv";
};
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Nov 24 19:43:03
2011 (r30552)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Nov 24 19:48:20
2011 (r30553)
@@ -6339,9 +6339,7 @@
bitcoin = callPackage ../applications/misc/bitcoin {
boost = boost144;
- wxGTK = wxGTK290;
- db4 = db47;
- inherit (xlibs) libSM;
+ db4 = db48;
};
bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
