Hi @tadeokondrak @worldofpeace ! I've applied all the requested changes in the recent updates to my branch. Let me know if there's anything else that can be improved!

ping @jtojnar @Mic92 because you reviewed #47378

It might make sense to change the sublime3’s common.nix to make it reusable. After all they both use the same base.

It might make sense to change the sublime3’s common.nix to make it reusable. After all they both use the same base.

Possibly, I don't have enough experience to comment on how nixos commonly does that, but it seems to be that there's enough differences between the sublime3 derivation and the sublime-merge derivation to not really make it worth it. They definitely share a few important bits of logic like the pkexec fixes, but sublime-merge is missing a lot of things that sublime3 does like supporting 32 bit systems, wrapping the plugin_host, creating a custom sublime_bash and fixing the Packages to use it, etc. Seems to me like you would need enough conditionals and overrides to account for the differences that it would just make the packages more difficult to maintain properly overall, but I don't know.

@jtojnar Are there any blockers to having this merged? Would you like me to work on creating the shared common.nix file before we commit this? I'm happy to help if that's what you think needs to happen.

Factoring out Sublime packages into a common expression can wait to future pull requests. However, I would like to see all the non-Merge-specific deviations from the Text expression to be applied there as well, in order to make the future unification easier. Basically, we want a minimal git diff --no-index pkgs/applications/editors/sublime/3/common.nix pkgs/applications/version-management/sublime-merge/common.nix.

Factoring out Sublime packages into a common expression can wait to future pull requests. However, I would like to see all the non-Merge-specific deviations from the Text expression to be applied there as well, in order to make the future unification easier. Basically, we want a minimal git diff --no-index pkgs/applications/editors/sublime/3/common.nix pkgs/applications/version-management/sublime-merge/common.nix.

@jtojnar I've added a commit that updates the sublime3 and sublime-merge common.nix files to better reflect their shared structure. If you run git diff --no-index pkgs/applications/editors/sublime/3/common.nix pkgs/applications/version-management/sublime-merge/common.nix it now has a minimal set of diffs that more accurately reflects the necessary build differences between the two packages. Incidentally this also fixes a bug in sublime3 where the icon files where not being linked to the proper directory preventing the desktop environment from displaying their custom icons.

Sorry that I didn't merge that for you sooner @zookatron

Thank you for your contribution and co-operation 💖

No problem, thanks @worldofpeace!