diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-23 08:36:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-23 08:36:59 +0100 |
commit | d52e5da7857b172f92003f3cb1ebd7d9c0d79af5 (patch) | |
tree | 3dc097c27a13336e36449af7bb9034cabedffe95 /pkgs/applications | |
parent | 635f24def516e10f0494e3dd554d61cae4a05857 (diff) | |
parent | 46425a65ac4df2010f9ad1c94f03e4cf95139891 (diff) | |
download | nixlib-d52e5da7857b172f92003f3cb1ebd7d9c0d79af5.tar nixlib-d52e5da7857b172f92003f3cb1ebd7d9c0d79af5.tar.gz nixlib-d52e5da7857b172f92003f3cb1ebd7d9c0d79af5.tar.bz2 nixlib-d52e5da7857b172f92003f3cb1ebd7d9c0d79af5.tar.lz nixlib-d52e5da7857b172f92003f3cb1ebd7d9c0d79af5.tar.xz nixlib-d52e5da7857b172f92003f3cb1ebd7d9c0d79af5.tar.zst nixlib-d52e5da7857b172f92003f3cb1ebd7d9c0d79af5.zip |
Merge pull request #39310 from Mic92/bitcoin-fixes
bitcoin-{unlimited,xt}: fix darwin
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/altcoins/bitcoin-unlimited.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/altcoins/bitcoin-xt.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/altcoins/default.nix | 20 |
3 files changed, 27 insertions, 11 deletions
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index d9040377ebe3..5a67dc565aa7 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent -, withGui }: +, withGui +, Foundation, ApplicationServices, AppKit }: with stdenv.lib; @@ -19,7 +20,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib miniupnpc utillinux protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt4 qrencode ] + ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; patches = [ ./bitcoin-unlimited-const-comparators.patch @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. - + The Bitcoin Unlimited (BU) project seeks to provide a voice to all stakeholders in the Bitcoin ecosystem. @@ -55,7 +57,7 @@ stdenv.mkDerivation rec { If you support an increase in the blocksize limit by any means - or just support Bitcoin conflict resolution as originally envisioned by its founder - - consider running a Bitcoin Unlimited client. + consider running a Bitcoin Unlimited client. ''; homepage = https://www.bitcoinunlimited.info/; maintainers = with maintainers; [ DmitryTsygankov ]; diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index ccc55d17bcf6..feb2924f8651 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent -, withGui }: +, withGui +, Foundation, ApplicationServices, AppKit }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -18,7 +19,8 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ openssl db48 boost zlib libevent miniupnpc utillinux protobuf curl ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qt4 qrencode ] + ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" @@ -36,7 +38,7 @@ stdenv.mkDerivation rec{ Bitcoin XT is an implementation of a Bitcoin full node, based upon the source code of Bitcoin Core. It is built by taking the latest stable Core release, applying a series of patches, and then doing deterministic - builds so anyone can check the downloads correspond to the source code. + builds so anyone can check the downloads correspond to the source code. ''; homepage = https://bitcoinxt.software/; maintainers = with maintainers; [ jefdaj ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 174ff96a1247..c58178e3edbb 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -10,14 +10,26 @@ rec { bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; - bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; - bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; + bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = true; + }; + bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + withGui = false; + }; bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; - bitcoin-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; }; - bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; }; + bitcoin-xt = callPackage ./bitcoin-xt.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + boost = boost165; withGui = true; + }; + bitcoind-xt = callPackage ./bitcoin-xt.nix { + inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; + boost = boost165; withGui = false; + }; btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; }; btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; |