From 721bf4c0018274b9ea53993ed88b6496be24060d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 23 Aug 2021 16:14:53 +0200 Subject: gnu: monero-gui: Fix build. * gnu/packages/finance.scm (monero-gui)[arguments]: Fix 'configure-flags' using gexp. Fix 'extract-monero-sources' phase. --- gnu/packages/finance.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 5e5be2170c..28186fb6bb 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -55,6 +55,7 @@ #:use-module (guix build-system go) #:use-module (guix build-system qt) #:use-module (guix deprecation) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages aidc) @@ -790,10 +791,9 @@ the Monero command line client and daemon.") (arguments `(#:tests? #f ; No tests #:configure-flags - (list "-DARCH=default" - "-DENABLE_PASS_STRENGTH_METER=ON" - (string-append "-DReadline_ROOT_DIR=" - (assoc-ref %build-inputs "readline"))) + ,#~(list "-DARCH=default" + "-DENABLE_PASS_STRENGTH_METER=ON" + (string-append "-DReadline_ROOT_DIR=" #$readline)) #:phases (modify-phases %standard-phases (add-after 'unpack 'extract-monero-sources @@ -801,9 +801,8 @@ the Monero command line client and daemon.") ;; to build the GUI. (lambda* (#:key inputs #:allow-other-keys) (mkdir-p "monero") - (invoke "tar" "-xv" "--strip-components=1" - "-C" "monero" - "-f" (assoc-ref inputs "monero-source")))) + (copy-recursively (assoc-ref inputs "monero-source") + "monero"))) (add-after 'extract-monero-sources 'fix-build (lambda _ (substitute* "src/version.js.in" -- cgit 1.4.1