| 26 Mar 2025 |
 hexa | https://wiki.gentoo.org/wiki/Project:Mozilla/Firefox_Benchmarks_2025_Q1 | 21:13:19 |
 emily | do we use Clang for the C++ parts of Mozilla? | 22:42:46 |
| hexa | yes, we exclusively build with clang | 22:55:49 |
| 27 Mar 2025 |
|  gabriel changed their display name from gabriel to gabriel | sick 🤒. | 12:42:55 |
| 28 Mar 2025 |
|  CJ joined the room. | 13:13:46 |
|  eveeifyeve joined the room. | 14:38:13 |
| eveeifyeve | Is there any way to disable this patch in buildMozillaMach since i am working on buildMozillaMach for zen browser at https://github.com/Eveeifyeve/nixpkgs/tree/zen-browser-moz?
Running phase: unpackPhase
@nix { "action": "setPhase", "phase": "unpackPhase" }
unpacking source archive /nix/store/fbck76hxp37rdsaiqqjdaq7g2yp97imc-source
source root is source
Running phase: patchPhase
@nix { "action": "setPhase", "phase": "patchPhase" }
applying patch /nix/store/vxk7kwxf60bppmblksx8j70w3j7ggz4h-env_var_for_system_dir-ff133.patch
can't find file to patch at input line 5
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
|index 6db876975187..5882c5d7f1d6 100644
|--- a/toolkit/xre/nsXREDirProvider.cpp
|+++ b/toolkit/xre/nsXREDirProvider.cpp
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
| 14:38:18 |
| hexa | does zen browser pass the wrong version or does it in fact have a conflict at that location? | 14:38:59 |
| emily | their source repository is not a superset of the Firefox repository, it contains patches etc. | 14:39:30 |
| emily | so https://github.com/Eveeifyeve/nixpkgs/commit/f164dcc84136c6eb13e9e4862cc7a77611398b7a is incorrect, AFAICT? it needs to download the corresponding Firefox source and apply the patches | 14:39:42 |
| emily | buildMozillaMach will expect a complete Firefox tree | 14:39:53 |
| hexa | 🤷♂️ | 14:40:24 |
| eveeifyeve | What's a way we can make it have the full source tree with firefox? | 14:41:40 |
 nbp | I would not think there is any way around using mach, as this is what is used to generate the various build tool files. | 14:41:44 |
| eveeifyeve | * What's a way we can make it have the full source tree with firefox? since I don't think there is a way to combine firefox + src. | 14:42:02 |
| nbp | Than I do not know what buildMozillaMach is doing. | 14:42:04 |
| hexa | roughly: mach configure, make, mach package, mach configure make, mach buildsymbols | 14:44:00 |
| emily | well, the package you are replacing has firefoxSrc and assembles a patched Firefox tree with their patching tool. | 14:44:07 |
| hexa | * roughly: mach configure, make, mach package, mach clobber, mach configure make, mach buildsymbols | 14:44:13 |
| emily | so presumably you need to do that here too. | 14:44:12 |
| nbp | mach configure might no longer be necessary (IIRC) | 14:45:04 |
| emily | though ideally their patch tool could be avoided and we'd just apply them as regular patches, but not sure how viable that is | 14:45:05 |
| emily | maybe it is simple as src/**/*.patch | 14:45:24 |
| gabriel changed their display name from gabriel | sick 🤒 to gabriel. | 14:46:47 |
| eveeifyeve | Is there a way of modifying the source directly via the buildMozillaMach since there is only one way of including a source though src | 14:51:47 |
| eveeifyeve | Do you mean use firefox source and then apply the patches on it. | 14:53:36 |
| eveeifyeve | * Do you mean use firefox source and then apply the patches on it? | 14:53:39 |
| emily | I believe src can be a list, but you can also just do it in a postUnpack/prePatch, same as how the old package did it | 14:54:05 |
| emily | yes, as far as I can tell all that actually needs doing is applying all their *.patch files to the corresponding Firefox version | 14:54:53 |
| emily | it seems like their patching tool can add new files from src/ too but I don't see any at a glance | 14:55:20 |
