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: 55250aae72c0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 03af480425c4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 25, 2020

  1. bitcoin: fix build on darwin

    @marsam
    marsam committed Jan 25, 2020
    Copy the full SHA
    d47671b View commit details

  2. Merge pull request #78454 from marsam/fix-bitcoind-darwin 

    bitcoin: fix build on darwin
    @marsam
    marsam authored Jan 25, 2020
    Copy the full SHA
    03af480 View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/applications/blockchains/bitcoin.nix
6 changes: 3 additions & 3 deletions pkgs/applications/blockchains/bitcoin.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck, hexdump
, zlib, miniupnpc, qtbase ? null, qttools ? null, wrapQtAppsHook ? null, utillinux, python3, qrencode, libevent
, withGui }:

@@ -31,6 +31,7 @@ in stdenv.mkDerivation rec {

nativeBuildInputs =
[ pkgconfig autoreconfHook ]
++ optional stdenv.isDarwin hexdump
++ optional withGui wrapQtAppsHook;
buildInputs = [ openssl db48 boost zlib zeromq
miniupnpc libevent]
@@ -75,7 +76,6 @@ in stdenv.mkDerivation rec {
homepage = http://www.bitcoin.org/;
maintainers = with maintainers; [ roconnor AndersonTorres ];
license = licenses.mit;
# bitcoin needs hexdump to build, which doesn't seem to build on darwin at the moment.
platforms = platforms.linux;
platforms = platforms.unix;
};
}