gnu: onionshare-cli: Update to 2.5.

* gnu/packages/tor.scm (onionshare-cli): Update to 2.5.
[phases]: Use gexps.
{bake-tor}: Use search-input-file and search-input-directory.

gnu/packages/tor.scm

@@ -246,7 +246,7 @@ networks.")
 (define-public onionshare-cli
   (package
     (name "onionshare-cli")
-    (version "2.4")
+    (version "2.5")
     (source
      (origin
        (method git-fetch)
@@ -255,7 +255,7 @@ networks.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-         (base32 "157ryxm4p1q7b3nj32v9fziw1li6s6s203b7ll80js14cbp6dj9d"))))
+        (base32 "16m5ll0v0qjbirwwzbzxg53kq4ry1n3ay5x0h8zkij73v3x0q864"))))
     (build-system python-build-system)
     (native-inputs
      (list python-pytest))
@@ -277,17 +277,18 @@ networks.")
            python-urllib3
            tor))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
           (add-after 'unpack 'bake-tor
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* (list "cli/onionshare_cli/common.py"
-                                "desktop/src/onionshare/gui_common.py")
+                                 "desktop/onionshare/gui_common.py")
                 (("shutil\\.which\\(\\\"tor\\\"\\)")
-                (string-append "\"" (which "tor") "\"")))
+                 (format #f "~s" (search-input-file inputs "bin/tor"))))
               (substitute* "cli/tests/test_cli_common.py"
                 (("/usr/share/tor")
-                (string-append (assoc-ref inputs "tor") "/share/tor")))))
+                 (search-input-directory inputs "share/tor")))))
           (add-before 'build 'change-directory
             (lambda _ (chdir "cli")))
           (replace 'check