gnu: cutter: Update to 2.3.4.

Fixes <https://issues.guix.gnu.org/63669>.

* gnu/packages/engineering.scm (cutter): Update to 2.3.4.
(radare2-for-cutter): Delete.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Reported-by: XVilka Haos of System <xvilka@gmail.com>
Change-Id: Id8c9087df56bd11a81103635920f9ad0b6a290b5

gnu/packages/engineering.scm

@@ -39,6 +39,7 @@
 ;;; Copyright © 2023 Theofilos Pechlivanis <theofilos.pechlivanis@gmail.com>
 ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2023 pinoaffe <pinoaffe@gmail.com>
+;;; Copyright © 2024 Juliana Sims <juli@incana.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2492,67 +2493,43 @@ analysis and AC analysis.  The engine is designed to do true mixed-mode
 simulation.")
     (license license:gpl3+)))
 
-(define-public radare2-for-cutter
-  (package
-    (inherit radare2)
-    (name "radare2")
-    (version "5.0.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/radareorg/radare2")
-                    (commit version)))
-              (sha256
-               (base32
-                "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420"))
-              (file-name (git-file-name name version))))))
-
 (define-public cutter
   (package
     (name "cutter")
-    (version "1.12.0")
+    (version "2.3.4")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://github.com/rizinorg/cutter")
-             (commit (string-append "v" version))))
+             (commit (string-append "v" version))
+             (recursive? #t)))
+       (modules '((guix build utils)))
+       (snippet #~(delete-file-recursively "rizin"))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ljj3j3apbbw628n2nyrxpbnclixx20bqjxm0xwggqzz9vywsar0"))))
+        (base32 "0d10g1wpw8p8hcxvw5q7ymfdxyrp4xqs6a49lf3gdgnmcpb248ad"))))
-    (build-system gnu-build-system)
+    (build-system qt-build-system)
     (arguments
-     `(#:phases
+     (list
-       (modify-phases %standard-phases
+      #:configure-flags #~(list "-DCUTTER_USE_BUNDLED_RIZIN=OFF")
-         (replace 'configure
+      #:tests? #f)) ;no tests
-           (lambda* (#:key inputs outputs #:allow-other-keys)
+    (native-inputs (list pkgconf))
-             (let ((out (assoc-ref outputs "out"))
+    (inputs (list libzip
-                   (radare2 (assoc-ref inputs "radare2")))
+                  openssl
-               ;; Fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib
+                  qtsvg-5
-               ;; override `qmake PREFIX=`.
+                  qttools-5
-               (substitute* "./src/lib_radare2.pri"
+                  rizin
-                 (("PREFIX") "R2PREFIX")
+                  zlib))
-                 (("R2PREFIX=/usr") (string-append "R2PREFIX=" radare2)))
-               (invoke "qmake"
-                       (string-append "PREFIX=" out)
-                       "./src/Cutter.pro")))))))
-    (native-inputs
-     (list pkg-config))
-    (inputs
-     (list qtbase-5
-           qtsvg-5
-           openssl
-           ;; Depends on radare2 4.5.1 officially, builds and works fine with
-           ;; radare2 5.0.0 but fails to build with radare2 5.1.1.
-           radare2-for-cutter))
     (home-page "https://cutter.re")
-    (synopsis "GUI for radare2 reverse engineering framework")
+    (synopsis "Software reverse engineering platform")
-    (description "Cutter is a GUI for radare2 reverse engineering framework.
+    (description
-Its goal is making an advanced andcustomizable reverse-engineering platform
+     "Cutter is a reverse engineering platform powered by @code{rizin}.  It
-while keeping the user experience at mind.  Cutter is created by reverse
+aims to be an advanced and customizable reverse engineering platform while
-engineers for reverse engineers.")
+keeping the user experience in mind.  Cutter is created by reverse engineers
-    (license (list license:cc-by-sa3.0  ;the "Iconic" icon set
+for reverse engineers.")
-                   license:gpl3+))))    ;everything else
+    (license (list license:cc-by-sa3.0 ;the "Iconic" icon set
+                   license:gpl3+))))   ;everything else
 
 (define-public lib3mf
   (package