diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-28 09:36:47 -0400 |
commit | 05e375d7103ac51e2da917965c37246c99f1ae4f (patch) | |
tree | 7ec4e9a2f5b7b1e2dea7c3e059f5b40e1dac1569 /pkgs/applications/altcoins/monero/default.nix | |
parent | 335934a073d6024d54c71bf82d5f8baab13abe75 (diff) | |
parent | c7d7abc51e5f9b9c7481a83c47b37508bf08b05b (diff) | |
download | nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.gz nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.bz2 nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.lz nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.xz nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.tar.zst nixpkgs-05e375d7103ac51e2da917965c37246c99f1ae4f.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/applications/altcoins/monero/default.nix')
-rw-r--r-- | pkgs/applications/altcoins/monero/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix index 57a058bada6..48932afaa0e 100644 --- a/pkgs/applications/altcoins/monero/default.nix +++ b/pkgs/applications/altcoins/monero/default.nix @@ -1,34 +1,31 @@ -{ stdenv, fetchpatch, fetchFromGitHub, cmake -, boost, miniupnpc, openssl, pkgconfig, unbound -, IOKit +{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, git +, boost, miniupnpc, openssl, unbound, cppzmq, zeromq, pcsclite +, readline, IOKit }: stdenv.mkDerivation rec { name = "monero-${version}"; - version = "0.11.1.0"; + version = "0.12.0.0"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - sha256 = "0nrpxx6r63ia6ard85d504x2kgaikvrhb5sg93ml70l6djyy1148"; + sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig git ]; - buildInputs = [ boost miniupnpc openssl unbound ] + buildInputs = [ boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline ] ++ stdenv.lib.optional stdenv.isDarwin IOKit; - patches = [ - ./build-wallet-rpc.patch # fixed in next release - ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_GUI_DEPS=ON" + "-DReadline_ROOT_DIR=${readline.dev}" ]; - doCheck = false; + hardeningDisable = [ "fortify" ]; installPhase = '' make install |