08/08: gnu: torbrowser: Add bridges.

[guix-commits]

snape pushed a commit to branch master
in repository guix.

commit 3902247b36d67139f73b3bed556badc243ca0966
Author: Clément Lassieur <clement@lassieur.org>
AuthorDate: Tue Dec 5 18:16:13 2023 +0100

    gnu: torbrowser: Add bridges.
    
    * gnu/packages/tor.scm (torbrowser)[arguments]: Add an 'add-bridges' phase,
    update the 'deploy-assets' phase so to fix the lyrebird path.
    [inputs]: Add
    go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird.
    
    Change-Id: I17c85486ab44178be9eab31a078f6392857a044f
---
 gnu/packages/tor.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index b81944ee6b..b20e17e4ce 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -53,6 +53,7 @@
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
+  #:use-module (gnu packages golang)
   #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
@@ -598,14 +599,27 @@ Browser.")
                 (substitute*
                     "toolkit/locales/en-US/toolkit/about/aboutAddons.ftl"
                   (("addons.mozilla.org") "gnuzilla.gnu.org"))))
-            (add-after 'install 'deploy-assets
+            (add-before 'build 'add-bridges ;see deploy.sh
               (lambda _
+                (let ((port (open-file
+                             "browser/app/profile/000-tor-browser.js" "a")))
+                  (display
+                   "#include ../../../tools/torbrowser/bridges.js" port)
+                  (newline port)
+                  (close port))))
+            (add-after 'install 'deploy-assets
+              (lambda* (#:key inputs #:allow-other-keys)
                 (let ((assets #$(this-package-input "torbrowser-assets"))
                       (lib (in-vicinity #$output "lib/torbrowser"))
                       (tor #$(this-package-input "tor-client")))
                   ;; TorBrowser/Data/Tor/torrc-defaults
                   (copy-recursively (in-vicinity assets "TorBrowser")
                                     (in-vicinity lib "TorBrowser"))
+                  (substitute*
+                      (in-vicinity lib "TorBrowser/Data/Tor/torrc-defaults")
+                    (("exec ./TorBrowser/Tor/PluggableTransports/lyrebird")
+                     (string-append
+                      "exec " (search-input-file inputs "bin/lyrebird"))))
                   ;; The geoip and geoip6 files are in the same directory as
                   ;; torrc-defaults.  (See TorProcess.sys.mjs.)
                   (mkdir-p (in-vicinity lib "TorBrowser/Data/Tor"))
@@ -755,6 +769,7 @@ Browser.")
     (inputs
      (modify-inputs (package-inputs icecat-minimal)
        (append bash-minimal
+               
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
                tor-client
                torbrowser-assets)))
     (propagated-inputs