Merge pull request #38408 from rnhmjoj/monero

monero-gui: 2018-03-31 -> 0.12.0.0

Changed files
+6 -6
pkgs
applications
altcoins
monero
monero-gui
top-level
+3 -3
pkgs/applications/altcoins/monero-gui/default.nix
···
stdenv.mkDerivation rec {
name = "monero-gui-${version}";
-
version = "2018-03-31";
+
version = "0.12.0.0";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero-gui";
-
rev = "fbe5ba831795008361f4de4347e7ecb6d868b4eb";
-
sha256 = "06cncwk4mxfw1rqwlwisasvangl73xyqwj4g6r9j85j5x4xy0k5s";
+
rev = "v${version}";
+
sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl";
};
nativeBuildInputs = [ qmake pkgconfig ];
+2 -2
pkgs/applications/altcoins/monero/default.nix
···
{ stdenv, fetchFromGitHub, cmake, pkgconfig, git
, boost, miniupnpc, openssl, unbound, cppzmq
, zeromq, pcsclite, readline
-
, IOKit ? null
+
, CoreData, IOKit, PCSC
}:
assert stdenv.isDarwin -> IOKit != null;
···
buildInputs = [
boost miniupnpc openssl unbound
cppzmq zeromq pcsclite readline
-
] ++ optional stdenv.isDarwin IOKit;
+
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release"
+1 -1
pkgs/top-level/all-packages.nix
···
mod-distortion = callPackage ../applications/audio/mod-distortion { };
monero = callPackage ../applications/altcoins/monero {
-
inherit (darwin.apple_sdk.frameworks) IOKit;
+
inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC;
boost = boost15x;