cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

bitcoin: fix build on Darwin

Browse source 
- use boost 1.7x - that's what upstream is doing anyway
- use autoSignDarwinBinariesHook on aarch64-darwin
This commit is contained in:
Pavol Rusnak 2021-11-12 22:10:51 +01:00
parent a97f20e5d8
commit 201661a628
No known key found for this signature in database
GPG key ID: 91F3B339B9A02A3D
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/blockchains/bitcoin/default.nix
View file

@ -5,6 +5,7 @@
, pkg-config , pkg-config
, util-linux , util-linux
, hexdump , hexdump
, autoSignDarwinBinariesHook
, wrapQtAppsHook ? null , wrapQtAppsHook ? null
, boost , boost
, libevent , libevent
@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
[ autoreconfHook pkg-config ] [ autoreconfHook pkg-config ]
++ optionals stdenv.isLinux [ util-linux ] ++ optionals stdenv.isLinux [ util-linux ]
++ optionals stdenv.isDarwin [ hexdump ] ++ optionals stdenv.isDarwin [ hexdump ]
++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
++ optionals withGui [ wrapQtAppsHook ]; ++ optionals withGui [ wrapQtAppsHook ];
buildInputs = [ boost libevent miniupnpc zeromq zlib ] buildInputs = [ boost libevent miniupnpc zeromq zlib ]

4
pkgs/top-level/all-packages.nix
View file

@ -29486,13 +29486,17 @@ with pkgs;
balanceofsatoshis = nodePackages.balanceofsatoshis; balanceofsatoshis = nodePackages.balanceofsatoshis;
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
boost = boost17x;
miniupnpc = miniupnpc_2; miniupnpc = miniupnpc_2;
withGui = true; withGui = true;
inherit (darwin) autoSignDarwinBinariesHook;
}; };
bitcoind = callPackage ../applications/blockchains/bitcoin { bitcoind = callPackage ../applications/blockchains/bitcoin {
boost = boost17x;
miniupnpc = miniupnpc_2; miniupnpc = miniupnpc_2;
withGui = false; withGui = false;
inherit (darwin) autoSignDarwinBinariesHook;
}; };
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; }; bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; };