From 7750f220bedb5f7a24e7429a4ccd794f9d07e4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 30 May 2022 12:23:00 +0200
Subject: [PATCH] gnu: tor: Record the file name of 'torsocks' in 'torify'.

* gnu/packages/tor.scm (tor)[arguments]: Add 'adjust-torify' phase.
[inputs]: Add TORSOCKS.
---
 gnu/packages/tor.scm | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 277acf4754..4c4ccbb003 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -73,6 +73,16 @@ (define-public tor
                    "--enable-zstd")
            #:phases
            #~(modify-phases %standard-phases
+               (add-before 'build 'adjust-torify
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   ;; Record in 'torify' the absolute file name of 'torsocks'.
+                   (let ((torsocks (search-input-file
+                                    inputs "/bin/torsocks")))
+                     (substitute* "contrib/client-tools/torify"
+                       (("pathfind torsocks")
+                        "true")
+                       (("exec torsocks")
+                        (string-append "exec " torsocks))))))
                (add-before 'check 'skip-practracker
                  ;; This is a style linter.  It doesn't get to throw fatal errors.
                  (lambda _
@@ -98,6 +108,7 @@ (define-public tor
      (list libevent
            libseccomp
            openssl
+           torsocks
            xz
            zlib
            `(,zstd "lib")))