guix_mirror_bot pushed a commit to branch browser-updates
in repository guix.

commit 77a90cf5be5c3d5bf925ae7bcd77f04a39d92698
Author: jbartunek <[email protected]>
AuthorDate: Wed Nov 18 22:33:56 2026 +0100

     gnu: librewolf: Adapt `make-librewolf-source` to upstream changes.
    
    * gnu/packages/librewolf.scm (librewolf):
    (make-librewolf-source):[origin]: Remove unused python infrastructure and
    Adapt to account for upstream changing their build system for the librewolf
    tarballs.
---
 gnu/packages/librewolf.scm | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm
index 4af1d57d6e0..5e524a74725 100644
--- a/gnu/packages/librewolf.scm
+++ b/gnu/packages/librewolf.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2024 Remco van 't Veer <[email protected]>
 ;;; Copyright © 2024 Ashvith Shetty <[email protected]>
 ;;; Copyright © 2025, 2026 Untrusem <[email protected]>
+;;; Copyright © 2026 Johannes Bartunek <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -152,8 +153,7 @@
                (use-modules (guix build utils))
                (set-path-environment-variable
                 "PATH" '("bin")
-                (list #+python
-                      #+(canonical-package bash)
+                (list #+(canonical-package bash)
                       #+(canonical-package gnu-make)
                       #+(canonical-package coreutils)
                       #+(canonical-package findutils)
@@ -163,15 +163,6 @@
                       #+(canonical-package grep)
                       #+(canonical-package pigz)
                       #+(canonical-package tar)))
-               (set-path-environment-variable
-                "PYTHONPATH"
-                (list #+(format #f "lib/python~a/site-packages"
-                                (version-major+minor
-                                 (package-version python))))
-                '#+(cons python-jsonschema
-                         (map second
-                              (package-transitive-propagated-inputs
-                               python-jsonschema))))
 
                ;; Copy LibreWolf source into the build directory and make
                ;; everything writable.
@@ -181,24 +172,22 @@
                ;; Patch Makefile to use the upstream source instead of
                ;; downloading.
                (substitute* '("Makefile")
-                 (("^(ff_source_tarball *:= *).*" _ var)
+                 (("^(ff_source_tarball *= *).*" _ var)
                   (string-append var #+ff-src)))
 
-               ;; Neuter GPG signing of the tarball.
-               (substitute* '("Makefile")
-                 (("if [ -f pk.asc ].*") ""))
-
                ;; Stage locales.
-               (setenv "SKIP_FETCHING_LOCALES" "true")
-               (substitute* '("scripts/librewolf-patches.py")
-                 (("^    exec\\('mkdir -p lw'\\)")
-                  (string-append
-                   "    exec('mkdir -p lw')\n    exec(\"cp -r "
-                   #+l10n
-                   " ./lw/l10n && chmod -R +w ./lw/l10n\")")))
+               (substitute* '("scripts/patch.sh")
+                 (("^.*git clone.*$" all)
+                  (string-append "    cp -r "
+                                 #+l10n
+                                 " $tmpdir/l10n\n    chmod +w $tmpdir/l10n 
-R\n")))
+
+               ;; Fix shebang.
+               (substitute* '("scripts/patch.sh")
+                 (("#!/bin/sh") (string-append "#!" (which "bash"))))
 
                ;; Run the build script
-               (invoke "make" "all")
+               (invoke "make" "tarball")
                (copy-file (string-append "librewolf-" #$version
                                          ".source.tar.gz")
                           #$output)))))

Reply via email to