From b9e5aeaf79e94a56d4ae002041142f24640a7ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 4 Apr 2018 11:14:42 +0100 Subject: [PATCH] monero: actually wants CoreData instead of monero-gui --- pkgs/applications/altcoins/monero/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 85f5c2eb07c..e87c3379399 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, git , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline -, IOKit ? null +, IOKit +, CoreData }: assert stdenv.isDarwin -> IOKit != null; @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline - ] ++ optional stdenv.isDarwin IOKit; + ] ++ optionals stdenv.isDarwin [ IOKit CoreData ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b085adaa047..744ae359601 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -612,7 +612,7 @@ with pkgs; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; cconv = callPackage ../tools/text/cconv { }; - + chkcrontab = callPackage ../tools/admin/chkcrontab { }; djmount = callPackage ../tools/filesystems/djmount { }; @@ -16701,12 +16701,11 @@ with pkgs; mod-distortion = callPackage ../applications/audio/mod-distortion { }; monero = callPackage ../applications/altcoins/monero { - inherit (darwin.apple_sdk.frameworks) IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit CoreData; boost = boost15x; }; monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { - inherit (darwin.apple_sdk.frameworks) CoreData; boost = boost15x; };