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

monero: actually wants CoreData instead of monero-gui

Browse Source
This commit is contained in:
Jörg Thalheim 2018-04-04 11:14:42 +01:00
parent dff0404d8d
commit b9e5aeaf79
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/altcoins/monero/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, git { stdenv, fetchFromGitHub, cmake, pkgconfig, git
, boost, miniupnpc, openssl, unbound, cppzmq , boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline , zeromq, pcsclite, readline
, IOKit ? null , IOKit
, CoreData
}: }:
assert stdenv.isDarwin -> IOKit != null; assert stdenv.isDarwin -> IOKit != null;
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost miniupnpc openssl unbound boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline cppzmq zeromq pcsclite readline
] ++ optional stdenv.isDarwin IOKit; ] ++ optionals stdenv.isDarwin [ IOKit CoreData ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"

5
pkgs/top-level/all-packages.nix
View File

@ -612,7 +612,7 @@ with pkgs;
container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { }; container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
cconv = callPackage ../tools/text/cconv { }; cconv = callPackage ../tools/text/cconv { };
chkcrontab = callPackage ../tools/admin/chkcrontab { }; chkcrontab = callPackage ../tools/admin/chkcrontab { };
djmount = callPackage ../tools/filesystems/djmount { }; djmount = callPackage ../tools/filesystems/djmount { };
@ -16701,12 +16701,11 @@ with pkgs;
mod-distortion = callPackage ../applications/audio/mod-distortion { }; mod-distortion = callPackage ../applications/audio/mod-distortion { };
monero = callPackage ../applications/altcoins/monero { monero = callPackage ../applications/altcoins/monero {
inherit (darwin.apple_sdk.frameworks) IOKit; inherit (darwin.apple_sdk.frameworks) IOKit CoreData;
boost = boost15x; boost = boost15x;
}; };
monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui {
inherit (darwin.apple_sdk.frameworks) CoreData;
boost = boost15x; boost = boost15x;
}; };