cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

buildMozillaMach: replace dbus workaround with upstream patch

Browse source 
https://bugzilla.mozilla.org/show_bug.cgi?id=1864083

The fix was targeted for Firefox 122.
This commit is contained in:
Martin Weinelt 2023-11-28 02:16:57 +01:00
parent 48d578b7f4
commit a72f24ef3b
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -252,6 +252,14 @@ buildStdenv.mkDerivation {
# vendored to update checksums # vendored to update checksums
./mp4parse-rust-170.patch ./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.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 "111") ./env_var_for_system_dir-ff111.patch
++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch ++ lib.optional (lib.versionAtLeast version "96" && lib.versionOlder version "121") ./no-buildconfig-ffx96.patch
@ -509,9 +517,6 @@ buildStdenv.mkDerivation {
preBuild = '' preBuild = ''
cd mozobj 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 = '' postBuild = ''