diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-06-08 22:03:27 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-06-08 22:03:31 +0200 |
| commit | 299b9a1b59d43ff157cd2e9579a6fc588feff1a9 (patch) | |
| tree | fdee9d19a5f6c92e2175b9eeb5fbb81df786a4fa /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 1a3ff178aaadfb3525242cb90f12bf0802d37752 (diff) | |
| download | nixpkgs-299b9a1b59d43ff157cd2e9579a6fc588feff1a9.tar nixpkgs-299b9a1b59d43ff157cd2e9579a6fc588feff1a9.tar.gz nixpkgs-299b9a1b59d43ff157cd2e9579a6fc588feff1a9.tar.bz2 nixpkgs-299b9a1b59d43ff157cd2e9579a6fc588feff1a9.tar.lz nixpkgs-299b9a1b59d43ff157cd2e9579a6fc588feff1a9.tar.xz nixpkgs-299b9a1b59d43ff157cd2e9579a6fc588feff1a9.tar.zst nixpkgs-299b9a1b59d43ff157cd2e9579a6fc588feff1a9.zip | |
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
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 7 |
1 files changed, 7 insertions, 0 deletions
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 |