me
/
guix
Archived
1
0
Fork 0
Code

gnu: torbrowser: Remove useless inputs. 

One should never change assets, so no point being an input.

* gnu/packages/tor.scm (torbrowser)[arguments]: In the ‘deploy-assets’ phase,
directly refer to ‘torbrowser-assets’.
[inputs]: Remove ‘torbrowser-assets’ and ‘bash-minimal’.

Change-Id: I096f430e8277021462afffa65983ed2a8af08ed2
master
Clément Lassieur 2024-01-18 21:03:26 +01:00
parent 7f7f2844ad
commit 17187aab61
No known key found for this signature in database
GPG Key ID: 89F96D4808F359C7
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/tor.scm
View File

@ -13,7 +13,7 @@
;;; Copyright © 2021-2023 Danial Behzadi <dani.behzi@ubuntu.com> ;;; Copyright © 2021-2023 Danial Behzadi <dani.behzi@ubuntu.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org> ;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org>
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2023, 2024 Clément Lassieur <clement@lassieur.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -609,11 +609,11 @@ Browser.")
(close port)))) (close port))))
(add-after 'install 'deploy-assets (add-after 'install 'deploy-assets
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((assets #$(this-package-input "torbrowser-assets")) (let ((lib (in-vicinity #$output "lib/torbrowser"))
(lib (in-vicinity #$output "lib/torbrowser"))
(tor #$(this-package-input "tor-client"))) (tor #$(this-package-input "tor-client")))
;; TorBrowser/Data/Tor/torrc-defaults ;; TorBrowser/Data/Tor/torrc-defaults
(copy-recursively (in-vicinity assets "TorBrowser") (copy-recursively (in-vicinity
#$torbrowser-assets "TorBrowser")
(in-vicinity lib "TorBrowser")) (in-vicinity lib "TorBrowser"))
(substitute* (substitute*
(in-vicinity lib "TorBrowser/Data/Tor/torrc-defaults") (in-vicinity lib "TorBrowser/Data/Tor/torrc-defaults")
@ -628,13 +628,14 @@ Browser.")
(copy-file (in-vicinity tor "share/tor/geoip6") (copy-file (in-vicinity tor "share/tor/geoip6")
(in-vicinity lib "TorBrowser/Data/Tor/geoip6")) (in-vicinity lib "TorBrowser/Data/Tor/geoip6"))
;; Fonts ;; Fonts
(copy-recursively (in-vicinity assets "fontconfig") (copy-recursively (in-vicinity
#$torbrowser-assets "fontconfig")
(in-vicinity lib "fontconfig")) (in-vicinity lib "fontconfig"))
(substitute* (in-vicinity lib "fontconfig/fonts.conf") (substitute* (in-vicinity lib "fontconfig/fonts.conf")
(("<dir>fonts</dir>") (("<dir>fonts</dir>")
(format #f "<dir>~a</dir>" (in-vicinity lib "fonts")))) (format #f "<dir>~a</dir>" (in-vicinity lib "fonts"))))
(delete-file-recursively (in-vicinity lib "fonts")) (delete-file-recursively (in-vicinity lib "fonts"))
(copy-recursively (in-vicinity assets "fonts") (copy-recursively (in-vicinity #$torbrowser-assets "fonts")
(in-vicinity lib "fonts"))))) (in-vicinity lib "fonts")))))
(replace 'build-sandbox-whitelist (replace 'build-sandbox-whitelist
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -768,10 +769,8 @@ Browser.")
'("16" "22" "24" "32" "48" "64" "128" "256")))))))) '("16" "22" "24" "32" "48" "64" "128" "256"))))))))
(inputs (inputs
(modify-inputs (package-inputs icecat-minimal) (modify-inputs (package-inputs icecat-minimal)
(append bash-minimal (append go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird tor-client)))
tor-client
torbrowser-assets)))
(propagated-inputs (propagated-inputs
(list noscript/icecat)) (list noscript/icecat))
(home-page "https://www.torproject.org") (home-page "https://www.torproject.org")