unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Ian Eure <ian@retrospec.tv>
To: 75499@debbugs.gnu.org
Cc: Ian Eure <ian@retrospec.tv>
Subject: [bug#75499] [PATCH 3/3] gnu: make-librewolf-source: Take l10n package as an arg.
Date: Sat, 11 Jan 2025 09:29:35 -0800	[thread overview]
Message-ID: <20250111172936.3737-3-ian@retrospec.tv> (raw)
In-Reply-To: <20250111172936.3737-1-ian@retrospec.tv>

* gnu/packages/librewolf.scm (make-librewolf-source): Take l10n package as an
arg.

Change-Id: I3c405edc07edb54e27afee16325c93a83d37ad79
---
 gnu/packages/librewolf.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 1d58191e0c..a4eb45f03e 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2021, 2022, 2023 John Kehayias <john.kehayias@protonmail.com>
 ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2023 Tomas Volf <wolf@wolfsden.cz>
-;;; Copyright © 2023 Ian Eure <ian@retrospec.tv>
+;;; Copyright © 2023, 2024, 2025 Ian Eure <ian@retrospec.tv>
 ;;; Copyright © 2024 Remco van 't Veer <remco@remworks.net>
 ;;; Copyright © 2024 Ashvith Shetty <ashvithshetty10@gmail.com>
 ;;;
@@ -126,7 +126,7 @@ (define firefox-l10n
       (file-name (git-file-name "firefox-l10n" commit))
       (sha256 (base32 "0g778fnxg5mkqm3rgryzl64f3n4pczngjdlby07vh2dycvmlyga8")))))
 
-(define* (make-librewolf-source #:key version firefox-hash librewolf-hash)
+(define* (make-librewolf-source #:key version firefox-hash librewolf-hash l10n)
   (let* ((ff-src (firefox-source-origin
                   (car (string-split version #\-))
                   firefox-hash))
@@ -182,7 +182,7 @@ (define* (make-librewolf-source #:key version firefox-hash librewolf-hash)
                  (substitute* "scripts/librewolf-patches.py"
                    (("l10n_dir = Path(\"..\", \"l10n\")")
                     (string-append
-                     "l10n_dir = \"" #+firefox-l10n "\""))))
+                     "l10n_dir = \"" #+l10n "\""))))
 
                ;; Run the build script
                (invoke "make" "all")
@@ -213,7 +213,8 @@ (define-public librewolf
      (make-librewolf-source
       #:version version
       #:firefox-hash "06ya18ma1gndci0aygz75hidn3kwa1kji78g8smh7fq0091aad7i"
-      #:librewolf-hash "05mlqqcvsa84h3nagm51hwsxkxsbcn2676fj4bih37ddlgkylf3b"))
+      #:librewolf-hash "05mlqqcvsa84h3nagm51hwsxkxsbcn2676fj4bih37ddlgkylf3b"
+      #:l10n firefox-l10n))
     (build-system gnu-build-system)
     (arguments
      (list
-- 
2.47.1





  parent reply	other threads:[~2025-01-11 17:30 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-11 17:27 [bug#75499] [PATCH 0/3] gnu: librewolf: Update to 133.0.3-1 Ian Eure
2025-01-11 17:29 ` [bug#75499] [PATCH 1/3] gnu: firefox-l10n: Update to d219efa7c64850dfb5904893e17a5431c7058192 Ian Eure
2025-01-11 17:29   ` [bug#75499] [PATCH 2/3] gnu: librewolf: Update to 133.0.3-1 Ian Eure
2025-01-11 17:29   ` Ian Eure [this message]
2025-01-12 22:00 ` [bug#75499] QA review for 75499 Rodion Goritskov
2025-01-22  3:45 ` [bug#75499] [PATCH v2 1/4] gnu: firefox-l10n: Update to d219efa7c64850dfb5904893e17a5431c7058192 Ian Eure
2025-01-22  3:45   ` [bug#75499] [PATCH v2 2/4] gnu: make-librewolf-source: Take l10n package as an arg Ian Eure
2025-01-22  3:45   ` [bug#75499] [PATCH v2 3/4] gnu: librewolf: Tidy code formatting Ian Eure
2025-01-22  3:45   ` [bug#75499] [PATCH v2 4/4] gnu: librewolf: Update to 134.0.1-1 [security fixes] Ian Eure
2025-01-22 10:23   ` bug#75499: [PATCH v2 1/4] gnu: firefox-l10n: Update to d219efa7c64850dfb5904893e17a5431c7058192 Z572

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250111172936.3737-3-ian@retrospec.tv \
    --to=ian@retrospec.tv \
    --cc=75499@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).