public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39310 from Mic92/bitcoin-fixes

Browse Source 
bitcoin-{unlimited,xt}: fix darwin
This commit is contained in:
Jörg Thalheim 2018-04-23 08:36:59 +01:00 committed by GitHub
commit d52e5da785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/altcoins/bitcoin-unlimited.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
, withGui }: , withGui
, Foundation, ApplicationServices, AppKit }:
with stdenv.lib; with stdenv.lib;
@ -19,7 +20,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib buildInputs = [ openssl db48 boost zlib
miniupnpc utillinux protobuf libevent ] miniupnpc utillinux protobuf libevent ]
++ optionals withGui [ qt4 qrencode ]; ++ optionals withGui [ qt4 qrencode ]
++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ];
patches = [ patches = [
./bitcoin-unlimited-const-comparators.patch ./bitcoin-unlimited-const-comparators.patch

6
pkgs/applications/altcoins/bitcoin-xt.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent
, withGui }: , withGui
, Foundation, ApplicationServices, AppKit }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
@ -18,7 +19,8 @@ stdenv.mkDerivation rec{
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib libevent buildInputs = [ openssl db48 boost zlib libevent
miniupnpc utillinux protobuf curl ] miniupnpc utillinux protobuf curl ]
++ optionals withGui [ qt4 qrencode ]; ++ optionals withGui [ qt4 qrencode ]
++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ];
configureFlags = [ configureFlags = [
"--with-boost-libdir=${boost.out}/lib" "--with-boost-libdir=${boost.out}/lib"

20
pkgs/applications/altcoins/default.nix
View File

@ -10,14 +10,26 @@ rec {
bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; };
bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; };
bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix {
bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; 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; }; bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; };
bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; }; bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; };
bitcoin-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; }; bitcoin-xt = callPackage ./bitcoin-xt.nix {
bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; }; 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; }; btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; };
btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; };