Merge pull request #38408 from rnhmjoj/monero

monero-gui: 2018-03-31 -> 0.12.0.0
This commit is contained in:
Daiderd Jordan 2018-04-04 21:38:10 +02:00 committed by GitHub
commit e0d86e5bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -12,13 +12,13 @@ with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "monero-gui-${version}"; name = "monero-gui-${version}";
version = "2018-03-31"; version = "0.12.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monero-project"; owner = "monero-project";
repo = "monero-gui"; repo = "monero-gui";
rev = "fbe5ba831795008361f4de4347e7ecb6d868b4eb"; rev = "v${version}";
sha256 = "06cncwk4mxfw1rqwlwisasvangl73xyqwj4g6r9j85j5x4xy0k5s"; sha256 = "1mg5ival8a2wdp14yib4wzqax4xyvd40zjy9anhszljds1439jhl";
}; };
nativeBuildInputs = [ qmake pkgconfig ]; nativeBuildInputs = [ qmake pkgconfig ];

View File

@ -1,7 +1,7 @@
{ 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 , CoreData, IOKit, PCSC
}: }:
assert stdenv.isDarwin -> IOKit != null; assert stdenv.isDarwin -> IOKit != null;
@ -24,7 +24,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 PCSC ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"

View File

@ -16703,7 +16703,7 @@ 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) CoreData IOKit PCSC;
boost = boost15x; boost = boost15x;
}; };