mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-11 13:49:23 -05:00
gnu: make-torbrowser: Make products independent from each other.
* gnu/packages/tor-browsers.scm (translation-base-browser): Rename to torbrowser-translation-base. (mullvadbrowser-translation-base): New variable. (translation-tor-browser): Rename to torbrowser-translation-specific. (translation-mullvad-browser): Rename to mullvadbrowser-translation-specific. (make-torbrowser): Add ‘translation-base’ and ‘translation-specific’ parameters and use them. (torbrowser, mullvadbrowser-base): Use the above parameters. (mullvadbrowser): Handle renaming. This allows translation-base-browser (now torbrowser-translation-base) and translation-tor-browser (now torbrowser-translation-specific) to be updated without triggering an update for Mullvad Browser. Change-Id: I2a94636eb6b0531c3a03cdb73c560d68060721ef
This commit is contained in:
parent
9b84b36296
commit
50f6077a43
1 changed files with 24 additions and 8 deletions
|
@ -161,9 +161,7 @@ (define %torbrowser-version "13.0.11")
|
||||||
(define %torbrowser-firefox-version "115.8.0esr-13.0-1-build2")
|
(define %torbrowser-firefox-version "115.8.0esr-13.0-1-build2")
|
||||||
|
|
||||||
;; See tor-browser-build/projects/translation/config.
|
;; See tor-browser-build/projects/translation/config.
|
||||||
;; If Tor Browser and Mullvad Browser updates are not synchronized, maybe this
|
(define torbrowser-translation-base
|
||||||
;; will have to be duplicated.
|
|
||||||
(define translation-base-browser
|
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -175,7 +173,7 @@ (define translation-base-browser
|
||||||
"1452lpzbx0a049ksw84q7fj93bldfpllpp86aa4kggiv7vb3dqxk"))))
|
"1452lpzbx0a049ksw84q7fj93bldfpllpp86aa4kggiv7vb3dqxk"))))
|
||||||
|
|
||||||
;; See tor-browser-build/projects/translation/config.
|
;; See tor-browser-build/projects/translation/config.
|
||||||
(define translation-tor-browser
|
(define torbrowser-translation-specific
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -219,6 +217,8 @@ (define* (make-torbrowser #:key
|
||||||
moz-app-name
|
moz-app-name
|
||||||
moz-app-remotingname
|
moz-app-remotingname
|
||||||
branding-directory
|
branding-directory
|
||||||
|
translation-base
|
||||||
|
translation-specific
|
||||||
assets
|
assets
|
||||||
locales
|
locales
|
||||||
build-date
|
build-date
|
||||||
|
@ -567,7 +567,7 @@ (define (runpaths-of-input label)
|
||||||
(let ((l10ncentral ".mozbuild/l10n-central"))
|
(let ((l10ncentral ".mozbuild/l10n-central"))
|
||||||
;; Temporary copy so that we can use ‘mv’ to mimic
|
;; Temporary copy so that we can use ‘mv’ to mimic
|
||||||
;; tor-browser-build/projects/firefox/build.
|
;; tor-browser-build/projects/firefox/build.
|
||||||
(copy-recursively #$translation-base-browser
|
(copy-recursively #$translation-base
|
||||||
"translation-base-browser")
|
"translation-base-browser")
|
||||||
(for-each
|
(for-each
|
||||||
(lambda (lang)
|
(lambda (lang)
|
||||||
|
@ -591,7 +591,7 @@ (define (runpaths-of-input label)
|
||||||
(let ((l10ncentral ".mozbuild/l10n-central"))
|
(let ((l10ncentral ".mozbuild/l10n-central"))
|
||||||
;; Temporary copy so that we can use ‘mv’ to mimic
|
;; Temporary copy so that we can use ‘mv’ to mimic
|
||||||
;; tor-browser-build/projects/firefox/build.
|
;; tor-browser-build/projects/firefox/build.
|
||||||
(copy-recursively #$translation-tor-browser
|
(copy-recursively #$translation-specific
|
||||||
"translation-tor-browser")
|
"translation-tor-browser")
|
||||||
(for-each
|
(for-each
|
||||||
(lambda (lang)
|
(lambda (lang)
|
||||||
|
@ -839,6 +839,8 @@ (define-public torbrowser
|
||||||
(make-torbrowser #:moz-app-name "torbrowser"
|
(make-torbrowser #:moz-app-name "torbrowser"
|
||||||
#:moz-app-remotingname "Tor Browser"
|
#:moz-app-remotingname "Tor Browser"
|
||||||
#:branding-directory "browser/branding/tb-release"
|
#:branding-directory "browser/branding/tb-release"
|
||||||
|
#:translation-base torbrowser-translation-base
|
||||||
|
#:translation-specific torbrowser-translation-specific
|
||||||
#:assets torbrowser-assets
|
#:assets torbrowser-assets
|
||||||
#:locales %torbrowser-locales
|
#:locales %torbrowser-locales
|
||||||
#:build-date %torbrowser-build-date
|
#:build-date %torbrowser-build-date
|
||||||
|
@ -889,7 +891,19 @@ (define %mullvadbrowser-version "13.0.10")
|
||||||
(define %mullvadbrowser-firefox-version "115.8.0esr-13.0-1-build1")
|
(define %mullvadbrowser-firefox-version "115.8.0esr-13.0-1-build1")
|
||||||
|
|
||||||
;; See tor-browser-build/projects/translation/config.
|
;; See tor-browser-build/projects/translation/config.
|
||||||
(define translation-mullvad-browser
|
(define mullvadbrowser-translation-base
|
||||||
|
(origin
|
||||||
|
(method git-fetch)
|
||||||
|
(uri (git-reference
|
||||||
|
(url "https://gitlab.torproject.org/tpo/translation.git")
|
||||||
|
(commit "16211a4b8524d71525f0ea73c07771c634132b30")))
|
||||||
|
(file-name "translation-base-browser")
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"1452lpzbx0a049ksw84q7fj93bldfpllpp86aa4kggiv7vb3dqxk"))))
|
||||||
|
|
||||||
|
;; See tor-browser-build/projects/translation/config.
|
||||||
|
(define mullvadbrowser-translation-specific
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
|
@ -935,6 +949,8 @@ (define mullvadbrowser-base
|
||||||
(make-torbrowser #:moz-app-name "mullvadbrowser"
|
(make-torbrowser #:moz-app-name "mullvadbrowser"
|
||||||
#:moz-app-remotingname "Mullvad Browser"
|
#:moz-app-remotingname "Mullvad Browser"
|
||||||
#:branding-directory "browser/branding/mb-release"
|
#:branding-directory "browser/branding/mb-release"
|
||||||
|
#:translation-base mullvadbrowser-translation-base
|
||||||
|
#:translation-specific mullvadbrowser-translation-specific
|
||||||
#:assets mullvadbrowser-assets
|
#:assets mullvadbrowser-assets
|
||||||
#:locales %mullvadbrowser-locales
|
#:locales %mullvadbrowser-locales
|
||||||
#:build-date %mullvadbrowser-build-date
|
#:build-date %mullvadbrowser-build-date
|
||||||
|
@ -976,7 +992,7 @@ (define-public mullvadbrowser
|
||||||
(lambda (lang)
|
(lambda (lang)
|
||||||
(system
|
(system
|
||||||
(format #f "cp -Lr ~a/~a .mozbuild/l10n-central/"
|
(format #f "cp -Lr ~a/~a .mozbuild/l10n-central/"
|
||||||
#$translation-mullvad-browser lang)))
|
#$mullvadbrowser-translation-specific lang)))
|
||||||
(map car #$%mullvadbrowser-locales))))
|
(map car #$%mullvadbrowser-locales))))
|
||||||
(add-before 'build 'fix-profiles
|
(add-before 'build 'fix-profiles
|
||||||
;; Otherwise the profile would change every time the install
|
;; Otherwise the profile would change every time the install
|
||||||
|
|
Loading…
Reference in a new issue