| 28 Mar 2025 |
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 |
eveeifyeve | and apply a custom mozilla config. | 14:56:23 |
emily | yes, I don't know how that works with buildMozillaMach though | 14:56:53 |
eveeifyeve | * and apply a custom mozilla config.
https://github.com/zen-browser/desktop/blob/dev/configs/macos/mozconfig | 14:56:54 |
vcunat | You can put whatever derivation into src =, i.e. construct the desired source in whatever way beforehand. | 14:57:13 |
vcunat | * You could alternatively put whatever derivation into src =, i.e. construct the desired source in whatever way beforehand. | 14:57:29 |
emily | I am not sure we would want to use their mozconfigs totally verbatim? it may be a good idea to diff them against the upstream ones. but I don't know that much about how the mach build actually works, so I defer to active packagers of Mozilla stuff here | 14:58:14 |
vcunat | I've done just routine updates and testing as far as I recall, really. | 15:00:09 |
vcunat | I don't understand/remember what's happening inside. | 15:00:33 |
eveeifyeve | How exactly would that be possible from the firefox source? | 15:10:26 |
eveeifyeve | * How exactly would that be possible from the firefox source? cause I don't see any functions that would do that. | 15:10:43 |
emily | buildMozillaMach takes arguments for patches | 15:11:08 |
emily | not sure if it can take globs or not | 15:11:29 |
emily | the usual patches can | 15:11:36 |
eveeifyeve | could you provide me an example because I tired extraPatches = ["${zensource}/src/**/*.patch"]; which is the fetchFromGitHub | 15:11:57 |
eveeifyeve | and it said no directry found | 15:12:14 |
eveeifyeve | * and it said no directory found | 15:12:19 |
eveeifyeve | zen-browser-unwrapped> /nix/store/c2g9v6m9qp4lf93ck4apw848cws78wzj-stdenv-darwin/setup: line 1421: /nix/store/fbck76hxp37rdsaiqqjdaq7g2yp97imc-source/src/**/*.patch: No such file or directory | 15:12:28 |
emily | my guess is extglob isn't on so ** isn't matching as expected? it might make sense to do it in unpackPhase instead or something. | 15:14:33 |
eveeifyeve | Redacted or Malformed Event | 15:20:23 |
eveeifyeve | Since there is patchs also in surfer that will have to be included as well. | 15:39:47 |
eveeifyeve | Also there is js/css files in browser repo do I add those to source? | 15:40:08 |