summaryrefslogtreecommitdiff
path: root/gnu/packages/tor.scm
diff options
context:
space:
mode:
authorClément Lassieur <clement@lassieur.org>2024-01-18 21:03:26 +0100
committerClément Lassieur <clement@lassieur.org>2024-01-19 00:48:09 +0100
commit17187aab61b064aff42a0fe911313011b7162de5 (patch)
tree7c192bdcf0559884b795366d93f26a1c23f83dfc /gnu/packages/tor.scm
parent7f7f2844ad8f7be42ce0f3287035b1a2a0ca9373 (diff)
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
Diffstat (limited to 'gnu/packages/tor.scm')
-rw-r--r--gnu/packages/tor.scm19
1 files changed, 9 insertions, 10 deletions
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index b20e17e4ce..ce84aa0726 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -13,7 +13,7 @@
;;; Copyright © 2021-2023 Danial Behzadi <dani.behzi@ubuntu.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; 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.
;;;
@@ -609,11 +609,11 @@ Browser.")
(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"))
+ (let ((lib (in-vicinity #$output "lib/torbrowser"))
(tor #$(this-package-input "tor-client")))
;; TorBrowser/Data/Tor/torrc-defaults
- (copy-recursively (in-vicinity assets "TorBrowser")
+ (copy-recursively (in-vicinity
+ #$torbrowser-assets "TorBrowser")
(in-vicinity lib "TorBrowser"))
(substitute*
(in-vicinity lib "TorBrowser/Data/Tor/torrc-defaults")
@@ -628,13 +628,14 @@ Browser.")
(copy-file (in-vicinity tor "share/tor/geoip6")
(in-vicinity lib "TorBrowser/Data/Tor/geoip6"))
;; Fonts
- (copy-recursively (in-vicinity assets "fontconfig")
+ (copy-recursively (in-vicinity
+ #$torbrowser-assets "fontconfig")
(in-vicinity lib "fontconfig"))
(substitute* (in-vicinity lib "fontconfig/fonts.conf")
(("<dir>fonts</dir>")
(format #f "<dir>~a</dir>" (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")))))
(replace 'build-sandbox-whitelist
(lambda* (#:key inputs #:allow-other-keys)
@@ -768,10 +769,8 @@ Browser.")
'("16" "22" "24" "32" "48" "64" "128" "256"))))))))
(inputs
(modify-inputs (package-inputs icecat-minimal)
- (append bash-minimal
- go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
- tor-client
- torbrowser-assets)))
+ (append go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
+ tor-client)))
(propagated-inputs
(list noscript/icecat))
(home-page "https://www.torproject.org")