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

altcoins.btc1: fix darwin build (#46398)

Browse Source 
Only hexdump was needed from utillinux which is also available on darwin
through the unixtools meta package.
This commit is contained in:
Daiderd Jordan 2018-09-09 14:54:16 +02:00 committed by xeji
parent c60ba3c848
commit 4e282e295f
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/altcoins/btc1.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost { stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48
, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent , boost, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
, withGui }: , AppKit
, withGui ? !stdenv.isDarwin
}:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
@ -12,11 +14,10 @@ stdenv.mkDerivation rec{
sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8";
}; };
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ];
buildInputs = [ openssl db48 boost zlib buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ]
miniupnpc protobuf libevent] ++ optionals withGui [ qt4 qrencode ]
++ optionals stdenv.isLinux [ utillinux ] ++ optional stdenv.isDarwin AppKit;
++ optionals withGui [ qt4 qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ]; ++ optionals withGui [ "--with-gui=qt4" ];

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

@ -32,8 +32,11 @@ rec {
boost = boost165; withGui = false; boost = boost165; withGui = false;
}; };
btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; }; btc1 = callPackage ./btc1.nix {
btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; inherit (darwin.apple_sdk.frameworks) AppKit;
boost = boost165;
};
btc1d = btc1.override { withGui = false; };
cryptop = python3.pkgs.callPackage ./cryptop { }; cryptop = python3.pkgs.callPackage ./cryptop { };