Subject: [bug#76616] [PATCH v3 2/3] gnu: librewolf: Append our configuration options to upstream mozconfig.

From: Mike Jones <[email-masked]>
Date: Sat, 1 Mar 2025 11:45:13 +0000

* gnu/packages/librewolf.scm (librewolf)[configure-flags]: Add
--disable-jxl, --disable-bootstrap to match previous configuration.
[phases]: Use upstream's mozconfig as the start of ours.

Change-Id: I7f21df8a84e9adb0cee69ad566daddb75bd790fb
---
 gnu/packages/librewolf.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 03a6acc455..0c99231092 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -236,6 +236,7 @@ (define-public librewolf
                               "--with-system-ffi"
                               "--enable-system-pixman"
                               "--enable-jemalloc"
+                              "--disable-jxl"
 
                               ;; see https://bugs.gnu.org/32833
                               "--with-system-nspr"
@@ -271,7 +272,8 @@ (define-public librewolf
                               "--enable-optimize"
                               "--enable-strip"
                               "--enable-hardening"
-                              "--disable-elf-hack"))
+                              "--disable-elf-hack"
+                              "--disable-bootstrap"))
       #:imported-modules %cargo-utils-modules
       #:modules `((ice-9 regex)
                   (ice-9 string-fun)
@@ -424,6 +426,8 @@ (define-public librewolf
                                (getcwd))
 
                        (let* ((mozconfig (string-append (getcwd) "/mozconfig"))
+                              (orig-mozconfig-content (call-with-input-file
+                                                        mozconfig get-string-all))
                               (out (assoc-ref outputs "out"))
                               (flags (cons (string-append "--prefix=" out)
                                            configure-flags)))
@@ -439,6 +443,7 @@ (define-public librewolf
                              (display "\n")))
                          (with-output-to-file mozconfig
                            (lambda ()
+                             (display orig-mozconfig-content)
                              (apply write-flags flags)
                              ;; The following option unsets Telemetry
                              ;; Reporting. With the Addons Fiasco,
-- 
2.48.1