From 4e282e295f6da95993c68b8f19d1a56762b352c7 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 9 Sep 2018 14:54:16 +0200 Subject: [PATCH] altcoins.btc1: fix darwin build (#46398) Only hexdump was needed from utillinux which is also available on darwin through the unixtools meta package. --- pkgs/applications/altcoins/btc1.nix | 17 +++++++++-------- pkgs/applications/altcoins/default.nix | 7 +++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix index 95e03ee6a21..2f85a894797 100644 --- a/pkgs/applications/altcoins/btc1.nix +++ b/pkgs/applications/altcoins/btc1.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost -, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent -, withGui }: +{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48 +, boost, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent +, AppKit +, withGui ? !stdenv.isDarwin +}: with stdenv.lib; stdenv.mkDerivation rec{ @@ -12,11 +14,10 @@ stdenv.mkDerivation rec{ sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib - miniupnpc protobuf libevent] - ++ optionals stdenv.isLinux [ utillinux ] - ++ optionals withGui [ qt4 qrencode ]; + nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ]; + buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ] + ++ optionals withGui [ qt4 qrencode ] + ++ optional stdenv.isDarwin AppKit; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 95d79a8650f..4236cd7910b 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -32,8 +32,11 @@ rec { boost = boost165; withGui = false; }; - btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; }; - btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; }; + btc1 = callPackage ./btc1.nix { + inherit (darwin.apple_sdk.frameworks) AppKit; + boost = boost165; + }; + btc1d = btc1.override { withGui = false; }; cryptop = python3.pkgs.callPackage ./cryptop { };