summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Le Vaillant <glv@posteo.net>2021-08-23 16:14:53 +0200
committerGuillaume Le Vaillant <glv@posteo.net>2021-08-23 16:14:53 +0200
commit721bf4c0018274b9ea53993ed88b6496be24060d (patch)
treeb54f13ba2e898cb7629991a28468868995ff5258
parent263f5b30d2caa42d494df50108b847b8722e02f5 (diff)
downloadguix-721bf4c0018274b9ea53993ed88b6496be24060d.tar.gz
gnu: monero-gui: Fix build.
* gnu/packages/finance.scm (monero-gui)[arguments]: Fix 'configure-flags'
  using gexp. Fix 'extract-monero-sources' phase.
-rw-r--r--gnu/packages/finance.scm13
1 files 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"