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

Merge pull request #270744 from yu-re-ka/mozilla-page-size

Browse source 
firefox: move page size patch to buildMozillaMach
This commit is contained in:
Martin Weinelt 2023-11-30 13:03:32 +01:00 committed by GitHub
commit 5b50058793
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -236,6 +236,15 @@ buildStdenv.mkDerivation {
++ 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 "121") ./no-buildconfig-ffx121.patch
++ lib.optionals (lib.versionAtLeast version "120" && lib.versionOlder version "120.0.1") [
(fetchpatch {
# Do not crash on systems without an expected statically assumed page size.
# https://phabricator.services.mozilla.com/D194458
name = "mozbz1866025.patch";
url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951";
hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM=";
})
]
++ extraPatches;
postPatch = ''

7
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -10,13 +10,6 @@
};
extraPatches = [
(fetchpatch {
# Do not crash on systems without an expected statically assumed page size.
# https://phabricator.services.mozilla.com/D194458
name = "mozbz1866025.patch";
url = "https://hg.mozilla.org/mozilla-central/raw-rev/42c80086da4468f407648f2f57a7222aab2e9951";
hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM=";
})
];
meta = {