From 44554d86dae9e595a9432b5a064f9aac63abf1fd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 4 Sep 2019 16:58:55 +0200 Subject: gnu: monero: Fix detection of readline library. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/finance.scm (monero)[arguments]: Define 'Readline_ROOT_DIR' in 'configure-flags'. Signed-off-by: Ludovic Courtès --- gnu/packages/finance.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 377cb3a405..5824a14c33 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -490,9 +490,12 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ("zeromq" ,zeromq))) (arguments `(#:out-of-source? #t - #:configure-flags '("-DARCH=default" - "-DBUILD_TESTS=ON" - "-DBUILD_GUI_DEPS=ON") + #:configure-flags + (list "-DARCH=default" + "-DBUILD_TESTS=ON" + "-DBUILD_GUI_DEPS=ON" + (string-append "-DReadline_ROOT_DIR=" + (assoc-ref %build-inputs "readline"))) #:phases (modify-phases %standard-phases ;; tests/core_tests need a valid HOME -- cgit v1.2.3 From b7a07bbd5ec3b97eab86c1ad574176715ae49652 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 4 Sep 2019 16:58:56 +0200 Subject: gnu: monero: Activate Trezor support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/finance.scm (monero): [native-inputs]: Add python and protobuf. [inputs]: Add libusb and protobuf. [arguments]: Add delete-dead-links phase. (monero-gui)[inputs]: Add libusb and protobuf. Signed-off-by: Ludovic Courtès --- gnu/packages/finance.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5824a14c33..30ea797daf 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -473,16 +473,20 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ("git" ,git) ("graphviz" ,graphviz) ("pkg-config" ,pkg-config) + ("protobuf" ,protobuf) + ("python" ,python) ("qttools" ,qttools))) (inputs `(("boost" ,boost) ("cppzmq" ,cppzmq) ("expat" ,expat) ("hidapi" ,hidapi) - ("libunwind" ,libunwind) ("libsodium" ,libsodium) + ("libunwind" ,libunwind) + ("libusb" ,libusb) ("miniupnpc" ,miniupnpc) ("openssl" ,openssl) + ("protobuf" ,protobuf) ("rapidjson" ,rapidjson) ("readline" ,readline) ("unbound" ,unbound) @@ -534,7 +538,13 @@ other machines/servers. Electroncash does not download the Bitcoin Cash blockch ":"))) (invoke "tests/unit_tests/unit_tests" (string-append "--gtest_filter=-" - excluded-unit-tests)))))))) + excluded-unit-tests))))) + (add-after 'install 'delete-dead-links + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (delete-file (string-append out "/lib/libprotobuf.so")) + (delete-file (string-append out "/lib/libusb-1.0.so")) + #t)))))) (home-page "https://getmonero.org/") (synopsis "Command-line interface to the Monero currency") (description @@ -563,9 +573,11 @@ the Monero command line client and daemon.") (inputs `(("boost" ,boost) ("hidapi" ,hidapi) - ("libunwind" ,libunwind) ("libsodium" ,libsodium) + ("libunwind" ,libunwind) + ("libusb" ,libusb) ("openssl" ,openssl) + ("protobuf" ,protobuf) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) -- cgit v1.2.3 From deb083628f46d56272e8df46364926c50c6df48b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 4 Sep 2019 16:58:57 +0200 Subject: gnu: monero-gui: Update to 0.14.1.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/finance.scm (monero-gui): Update to 0.14.1.2. Signed-off-by: Ludovic Courtès --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/finance.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 30ea797daf..3fa0a4d331 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -555,7 +555,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.14.1.0") + (version "0.14.1.2") (source (origin (method git-fetch) @@ -565,7 +565,7 @@ the Monero command line client and daemon.") (file-name (git-file-name name version)) (sha256 (base32 - "0ilx47771faygf97wilm64xnqxgxa3b43q0g9v014npk0qj8pc31")))) + "1rm043r6y2mzy8pclnzbjjfxgps8pkfa2b92p66k8y8rdmgq6m1k")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3