-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
telegram-desktop: port derivation improvements from kotatogram-desktop #352359
Conversation
Result of 1 package failed to build:
5 packages built:
|
50dcc38
to
5a0175b
Compare
@NickCao would be nice if you give a review, I want to get this sooner to start working on rebasing telegram and kotatogram to the new macOS SDK handling before branch off so 24.11 includes all the features currently commented in macos.patch. |
df417ae
to
39090b8
Compare
Wow I thought of making webkitgtk optional for a long time, thanks for doing that! |
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/with-webkit.nix
Outdated
Show resolved
Hide resolved
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix
Outdated
Show resolved
Hide resolved
73c1068
to
3e5892b
Compare
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
Outdated
Show resolved
Hide resolved
3e5892b
to
91ae91a
Compare
|
Yeah, it fails on master since staging-next got merged... |
91ae91a
to
fb3593a
Compare
It's enabled by default anyway
fb3593a
to
b6de85c
Compare
Should build now |
@ofborg build telegram-desktop |
@ofborg build kotatogram-desktop |
Also: I'd intend to merge this after 24.11 branch off. |
but why? 🤔 |
Because this is very much a breaking change? (Well I might not even able to convince myself on this one, since webkitgtk integration has been broken from time to time) |
ee10cfb
to
061b2fa
Compare
Ok, added a toggle to build without webkitgtk so that just kotatogram can continue to use the wrapper |
061b2fa
to
271e701
Compare
Result of 1 package failed to build:
4 packages built:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
diff LGTM, materialgram
already failing on master.
pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
Outdated
Show resolved
Hide resolved
Quite a lot of current dependencies are not used by the application while some new optional dependencies are missing leading to subpar UX
Quite a lot of current dependencies are not used by the library while some new optional dependencies are missing leadin g to subpar UX This also makes all dependencies propagated as that is logical for a static library
271e701
to
87e3f9d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested basic functionality.
@clot27 btw, I have contacted 64gram developer, you should be able to get rid of the patch and cmake flags in your override soon |
@NickCao is there still any sense to port the webkit wrapper to telegram--desktop or is the withWebKitGTK build option enough? |
There still is, I'd say most of the users can't care less about webkit and making that optional can be beneficial. |
I mean you can now add something like that to all-packages.nix:
And the only (practical) difference to the wrapper will be that Hydra will build telegram-desktop two times for Linux. idk how big telegram-desktop is for Hydra, maybe there's no practical need in the additional wrapper and that's enough. |
telegram-desktop is certainly on the medium-large side, thus I'm in favor of the wrapper approach, just not that satisfied with the current implementation. |
ok, here's it: #353243 |
This backports various improvements made in kotatogram-desktop derivation, such as actualizing specified dependencies and rebases kotatogram-desktop on top of telegram-desktop override.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.