From 299b9a1b59d43ff157cd2e9579a6fc588feff1a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 8 Jun 2022 22:03:27 +0200 Subject: buildMozillaMach: add patch for rust-cbindgen 0.24 compat Fixes a regression caused by an update to rust-cbindgen 0.24.x, where the definition for ROOT_CLIP_CHAIN is now autogenerated and causes the build to abort with a redefinition error. https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 Patch by Ollivier Tilloy from Canonical https://github.com/canonical/firefox-snap/commit/5622734942524846fb0eb7108918c8cd8557fde3 --- pkgs/applications/networking/browsers/firefox/common.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/applications/networking/browsers/firefox/common.nix') diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e82a87c59ec..eae5353aeb1 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -21,6 +21,7 @@ { lib , pkgs , stdenv +, fetchpatch # build time , autoconf @@ -219,6 +220,12 @@ buildStdenv.mkDerivation ({ ]; patches = [ + (fetchpatch { + # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 + name = "rust-cbindgen-0.24.2-compat.patch"; + url = "https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch"; + hash = "sha256-+wNZhkDB3HSknPRD4N6cQXY7zMT/DzNXx29jQH0Gb1o="; + }) ] ++ lib.optional (lib.versionAtLeast version "86") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "90" && lib.versionOlder version "95") ./no-buildconfig-ffx90.patch -- cgit 1.4.1