summary refs log tree commit diff
diff options
context:
space:
mode:
authorrnhmjoj <rnhmjoj@inventati.org>2018-09-04 01:13:46 +0200
committerrnhmjoj <rnhmjoj@inventati.org>2018-09-04 14:20:41 +0200
commit90ab6c8400c5c68e32113441e8dc4166dae50e98 (patch)
tree7cdb6ee86c8507836d0f8660e32cf26fa6a53e13
parent252c0d4c82b70ede96cb669485f78aaa99400921 (diff)
downloadnixpkgs-90ab6c8400c5c68e32113441e8dc4166dae50e98.tar
nixpkgs-90ab6c8400c5c68e32113441e8dc4166dae50e98.tar.gz
nixpkgs-90ab6c8400c5c68e32113441e8dc4166dae50e98.tar.bz2
nixpkgs-90ab6c8400c5c68e32113441e8dc4166dae50e98.tar.lz
nixpkgs-90ab6c8400c5c68e32113441e8dc4166dae50e98.tar.xz
nixpkgs-90ab6c8400c5c68e32113441e8dc4166dae50e98.tar.zst
nixpkgs-90ab6c8400c5c68e32113441e8dc4166dae50e98.zip
monero: 0.12.0.0 -> 0.12.3.0
-rw-r--r--pkgs/applications/altcoins/monero/default.nix21
1 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index cbba1ecba14..a4a884707a9 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchgit
 , cmake, pkgconfig, git
 , boost, miniupnpc, openssl, unbound, cppzmq
 , zeromq, pcsclite, readline
@@ -11,25 +11,16 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name    = "monero-${version}";
-  version = "0.12.0.0";
+  version = "0.12.3.0";
 
-  src = fetchFromGitHub {
-    owner  = "monero-project";
-    repo   = "monero";
+  src = fetchgit {
+    url    = "https://github.com/monero-project/monero.git";
     rev    = "v${version}";
-    sha256 = "1lc9mkrl1m8mdbvj88y8y5rv44vinxf7dyv221ndmw5c5gs5zfgk";
+    sha256 = "1609k1qn9xx37a92ai36rajds9cmdjlkqyka95hks5xjr3l5ca8i";
   };
 
   nativeBuildInputs = [ cmake pkgconfig git ];
 
-  patches = [
-    # fix daemon crash, remove with 0.12.1.0 update
-    (fetchpatch {
-      url    = "https://github.com/monero-project/monero/commit/08343ab.diff";
-      sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83";
-    })
-  ];
-
   buildInputs = [
     boost miniupnpc openssl unbound
     cppzmq zeromq pcsclite readline
@@ -39,7 +30,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_BUILD_TYPE=Release"
     "-DBUILD_GUI_DEPS=ON"
     "-DReadline_ROOT_DIR=${readline.dev}"
-  ];
+  ] ++ optional stdenv.isDarwin "-DBoost_USE_MULTITHREADED=OFF";
 
   hardeningDisable = [ "fortify" ];