Merge pull request #38408 from rnhmjoj/monero
monero-gui: 2018-03-31 -> 0.12.0.0
This commit is contained in:
commit
e0d86e5bf0
@ -12,13 +12,13 @@ with stdenv.lib;
|
||||
|
||||
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 ];
|
||||
|
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, git
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq
|
||||
, zeromq, pcsclite, readline
|
||||
, IOKit ? null
|
||||
, CoreData, IOKit, PCSC
|
||||
}:
|
||||
|
||||
assert stdenv.isDarwin -> IOKit != null;
|
||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
cppzmq zeromq pcsclite readline
|
||||
] ++ optional stdenv.isDarwin IOKit;
|
||||
] ++ optionals stdenv.isDarwin [ IOKit CoreData PCSC ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_BUILD_TYPE=Release"
|
||||
|
@ -16703,7 +16703,7 @@ 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) CoreData IOKit PCSC;
|
||||
boost = boost15x;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user