diff options
| author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2023-11-28 03:50:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-28 03:50:14 +0100 |
| commit | 19173a85eb60db6efe117523d4e597a182aae69b (patch) | |
| tree | ab8c8b374934aa3c8e3d35a90154cabffa9df874 /pkgs/applications | |
| parent | cc0257d0632d2645030f2b22ee8aa96b0c8c1859 (diff) | |
| parent | a72f24ef3bf6538b1dbb5d024e7b0f9517dddb72 (diff) | |
| download | nixlib-19173a85eb60db6efe117523d4e597a182aae69b.tar nixlib-19173a85eb60db6efe117523d4e597a182aae69b.tar.gz nixlib-19173a85eb60db6efe117523d4e597a182aae69b.tar.bz2 nixlib-19173a85eb60db6efe117523d4e597a182aae69b.tar.lz nixlib-19173a85eb60db6efe117523d4e597a182aae69b.tar.xz nixlib-19173a85eb60db6efe117523d4e597a182aae69b.tar.zst nixlib-19173a85eb60db6efe117523d4e597a182aae69b.zip | |
Merge pull request #270536 from mweinelt/firefox-dbus-cflags-fix
buildMozillaMach: replace dbus workaround with upstream patch
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 183b49b909d8..833d8799d936 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -252,6 +252,14 @@ buildStdenv.mkDerivation { # vendored to update checksums ./mp4parse-rust-170.patch ] + ++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "122") [ + # dbus cflags regression fix + # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083 + (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/f1f5f98290b3"; + hash = "sha256-5PzVNJvPNX8irCqj1H38SFDydNJZuBHx167e1TQehaI="; + }) + ] ++ lib.optional (lib.versionOlder version "111") ./env_var_for_system_dir-ff86.patch ++ lib.optional (lib.versionAtLeast version "111") ./env_var_for_system_dir-ff111.patch ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch @@ -509,9 +517,6 @@ buildStdenv.mkDerivation { preBuild = '' cd mozobj - '' + lib.optionalString (lib.versionAtLeast version "120") '' - # https://bugzilla.mozilla.org/show_bug.cgi?id=1864083 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config dbus-1 --cflags)" ''; postBuild = '' |