swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #195102 from witheredsea7df/upgrade/bitcoin-abc

Browse source 
bitcoin-abc: 0.21.13 -> 0.26.2
This commit is contained in:
Lassulus 2022-10-09 09:21:09 +02:00 committed by GitHub
parent 21469bd965 b206c7d019
commit d052fcf0ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/blockchains/bitcoin-abc/default.nix
View file

@ -15,6 +15,7 @@
, protobuf
, qrencode
, libevent
, sqlite
, withGui
, python3
, jemalloc
@ -23,17 +24,15 @@
mkDerivation rec {
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
version = "0.21.13";
version = "0.26.2";
src = fetchFromGitHub {
owner = "bitcoin-ABC";
repo = "bitcoin-abc";
rev = "v${version}";
sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav";
sha256 = "0gz4713lk3alk3ykwq1bdqjywadrfrnb7n2878136g01n87j00az";
};
patches = [ ./fix-bitcoin-qt-build.patch ];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [
openssl
@ -47,6 +46,7 @@ mkDerivation rec {
util-linux
protobuf
libevent
sqlite
] ++ lib.optionals withGui [ qtbase qttools qrencode ];
cmakeFlags = lib.optionals (!withGui) [

15
pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch
View file

@ -1,15 +0,0 @@
--- bitcoin-abc-v0.15.0-src/build-aux/m4/bitcoin_qt.m4 1970-01-01 01:00:01.000000000 +0100
+++ bitcoin-abc-v0.15.0-src.org/build-aux/m4/bitcoin_qt.m4 2017-09-27 23:38:44.748384197 +0100
@@ -35,11 +35,7 @@
dnl Output: $1 is set to the path of $2 if found. $2 are searched in order.
AC_DEFUN([BITCOIN_QT_PATH_PROGS],[
BITCOIN_QT_CHECK([
- if test "x$3" != x; then
- AC_PATH_PROGS($1,$2,,$3)
- else
- AC_PATH_PROGS($1,$2)
- fi
+ AC_PATH_PROGS($1,$2)
if test "x$$1" = x && test "x$4" != xyes; then
BITCOIN_QT_FAIL([$1 not found])
fi