gnu: radare2: Update to 6.1.6.

* gnu/packages/engineering.scm (radare2): Update to 6.1.6.
  [#:configure-flags]: Use system-installed zydis.
  [#:phases]: Add phase 'find-capital-zydis'.
  [inputs]: Add zydis and zycore.

Merges: https://codeberg.org/guix/guix/pulls/9121
Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>

1 files changed, 13 insertions, 4 deletions

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index b6d400229c7..99ce654981a 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1721,7 +1721,8 @@ bootloader in Espressif ESP8266 & ESP32 series chips.")
 (define-public radare2
   (package
     (name "radare2")
-    (version "6.1.4")                   ;keep in sync with iaito
+    ;; TODO: Delete upstreamed phase 'find-capital-zydis' at versions >6.1.6.
+    (version "6.1.6")                   ;keep in sync with iaito,r2ghidra
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1729,7 +1730,7 @@ bootloader in Espressif ESP8266 & ESP32 series chips.")
                     (commit version)))
               (sha256
                (base32
-                "0gq90rwwmkfc7v1rhyr3lw859rsm1ryhzrwidhhh6pbp6jv03k6w"))
+                "1a1d36nk4jkzlxywrzgf45wlzh7zifl7ilz8nj89d7n0mlk55g8r"))
               (file-name (git-file-name name version))
               (patches
                (search-patches "radare2-fix-meson-build-to-use-sys-sdb.patch"
@@ -1746,9 +1747,15 @@ bootloader in Espressif ESP8266 & ESP32 series chips.")
               "-Duse_sys_openssl=true"
               "-Duse_sys_xxhash=true"
               "-Duse_sys_zip=true"
-              "-Duse_sys_zlib=true")
+              "-Duse_sys_zlib=true"
+              "-Duse_sys_zydis=true")
       #:phases
       #~(modify-phases %standard-phases
+          (add-before 'configure 'find-capital-zydis
+            (lambda _
+              (substitute* '("meson.build")
+                ;; We want the big one.
+                (("(find_library\\(')zydis" _ f) (string-append f "Zydis")))))
           ;; CHECK LATER: This patches an incorrect relative include.
           (add-before 'build 'fix-relative-include
             (lambda _
@@ -1784,7 +1791,9 @@ bootloader in Espressif ESP8266 & ESP32 series chips.")
            lz4
            quickjs-ng
            xxhash
-           zlib))
+           zlib
+           zycore
+           zydis))
     (native-inputs
      (list node
            perl