firefox-esr-91: 91.5.1esr -> 91.6.0esr

main
Martin Weinelt 2 years ago
parent a41acde05c
commit 38219f7cc7
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
  1. 3
      pkgs/applications/networking/browsers/firefox/common.nix
  2. 13
      pkgs/applications/networking/browsers/firefox/fix-build-with-wayland-1.20.patch
  3. 4
      pkgs/applications/networking/browsers/firefox/packages.nix

@ -134,9 +134,6 @@ buildStdenv.mkDerivation ({
lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch ++
lib.optional (lib.versionAtLeast version "96") ./no-buildconfig-ffx96.patch ++
# Fix wayland 1.20 compatibility (https://bugzilla.mozilla.org/show_bug.cgi?id=1745560:)
lib.optional (lib.versionOlder version "96") ./fix-build-with-wayland-1.20.patch ++
patches;
# Ignore trivial whitespace changes in patches, this fixes compatibility of

@ -1,13 +0,0 @@
diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
index 7a448e6..7792581 100644
--- a/widget/gtk/mozwayland/mozwayland.c
+++ b/widget/gtk/mozwayland/mozwayland.c
@@ -200,3 +200,8 @@ MOZ_EXPORT int wl_list_empty(const struct wl_list* list) { return -1; }
MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
struct wl_list* other) {}
+
+MOZ_EXPORT struct wl_proxy *
+wl_proxy_marshal_flags(struct wl_proxy *proxy, uint32_t opcode,
+ const struct wl_interface *interface, uint32_t version,
+ uint32_t flags, ...) { return NULL; }

@ -32,10 +32,10 @@ rec {
firefox-esr-91 = common rec {
pname = "firefox-esr";
version = "91.5.1esr";
version = "91.6.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "26239e7a94b79f1e24a6667d7cf1c398d75992e8850144affbc5d3f34f04b91f0c9b020cab662b2cd4927924839ff2ddd2f3605c537bb5494fd9ac0d951b14fa";
sha512 = "3dd1929f93cdd087a93fc3597f32d9005c986b59832954e01a8c2472b179c92ad611eaa73d3fc000a08b838a0b70da73ff5ba82d6009160655ba6894cf04520e";
};
meta = {

Loading…
Cancel
Save