diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-01-17 20:36:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-17 20:36:05 +0100 |
| commit | 50cbe8b51767bb8d3ce61c8c7f9fcffec657c92f (patch) | |
| tree | 59a89f20eb7a07367b1aad62b8fbc2cbf6071522 /pkgs/applications/blockchains | |
| parent | 2c18940df09ab804dd1c488f7757c7ca4543babe (diff) | |
| parent | f324c9a0b616bc0cb48ddded1744bfc66129346f (diff) | |
Merge pull request #106837 from prusnak/bitcoin-no-wallet
bitcoin: 0.20.1 -> 0.21.0 + allow build without wallet
Diffstat (limited to 'pkgs/applications/blockchains')
| -rw-r--r-- | pkgs/applications/blockchains/bitcoin.nix | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 55eef089e0ed..315be75a8024 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -1,8 +1,9 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , autoreconfHook , db48 +, sqlite , boost , zeromq , hexdump @@ -16,11 +17,12 @@ , qrencode , libevent , withGui +, withWallet ? true }: with lib; let - version = "0.20.1"; + version = "0.21.0"; majorMinorVersion = versions.majorMinor version; desktop = fetchurl { url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop"; @@ -36,15 +38,16 @@ stdenv.mkDerivation rec { "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "4bbd62fd6acfa5e9864ebf37a24a04bc2dcfe3e3222f056056288d854c53b978"; + sha256 = "1a91202c62ee49fb64d57a52b8d6d01cd392fffcbef257b573800f9289655f37"; }; nativeBuildInputs = - [ pkgconfig autoreconfHook ] + [ pkg-config autoreconfHook ] ++ optional stdenv.isDarwin hexdump ++ optional withGui wrapQtAppsHook; - buildInputs = [ db48 boost zlib zeromq miniupnpc libevent ] + buildInputs = [ boost zlib zeromq miniupnpc libevent ] ++ optionals stdenv.isLinux [ util-linux ] + ++ optionals withWallet [ db48 sqlite ] ++ optionals withGui [ qtbase qttools qrencode ]; postInstall = optional withGui '' @@ -58,8 +61,9 @@ stdenv.mkDerivation rec { ] ++ optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] - ++ optionals withGui [ + ] ++ optionals (!withWallet) [ + "--disable-wallet" + ] ++ optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -87,7 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://bitcoin.org/"; downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; changelog = "https://bitcoincore.org/en/releases/${version}/"; - maintainers = with maintainers; [ roconnor ]; + maintainers = with maintainers; [ prusnak roconnor ]; license = licenses.mit; platforms = platforms.unix; }; |