Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2c18940df09a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 50cbe8b51767
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 16, 2021

  1. bitcoin: introduce withWallet flag, allow building without wallet

    @prusnak
    prusnak committed Jan 16, 2021
    Copy the full SHA
    672607c View commit details

  2. bitcoin: 0.20.1 -> 0.21.0 

    + add sqlite to buildInputs (if wallet is enabled)
    @prusnak
    prusnak committed Jan 16, 2021
    Copy the full SHA
    f324c9a View commit details

Commits on Jan 17, 2021

  1. Merge pull request #106837 from prusnak/bitcoin-no-wallet 

    bitcoin: 0.20.1 -> 0.21.0 + allow build without wallet
    @prusnak
    prusnak authored Jan 17, 2021
    Copy the full SHA
    50cbe8b View commit details
Showing with 12 additions and 8 deletions.
  1. +12 −8 pkgs/applications/blockchains/bitcoin.nix
20 changes: 12 additions & 8 deletions pkgs/applications/blockchains/bitcoin.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};