nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270536 from mweinelt/firefox-dbus-cflags-fix

Browse Source 
buildMozillaMach: replace dbus workaround with upstream patch
This commit is contained in:
Martin Weinelt 2023-11-28 03:50:14 +01:00 committed by GitHub
commit 19173a85eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
./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 = ''