Skip to content

telegram-desktop (and forks): make webkitgtk optional, and update to latest version#353524

Merged
NickCao merged 7 commits intoNixOS:masterfrom
NickCao:telegram-desktop-webkit
Nov 4, 2024
Merged

telegram-desktop (and forks): make webkitgtk optional, and update to latest version#353524
NickCao merged 7 commits intoNixOS:masterfrom
NickCao:telegram-desktop-webkit

Conversation

@NickCao
Copy link
Member

@NickCao NickCao commented Nov 3, 2024

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ilya-fedin
Copy link
Contributor

Can you also remove kotato's with-webkit.nix and the corresponding entry from all-packages.nix?

@NickCao NickCao force-pushed the telegram-desktop-webkit branch from b52cf42 to 53d4b7c Compare November 3, 2024 22:56
@NickCao
Copy link
Member Author

NickCao commented Nov 3, 2024

Can you also remove kotato's with-webkit.nix and the corresponding entry from all-packages.nix?

Done. materialgram is still broken, maybe also switch it to qt5?

@ilya-fedin
Copy link
Contributor

Done. materialgram is still broken, maybe also switch it to qt5?

Maybe... Another way is to switch tdesktop to ffmpeg_6 which should make tdesktop, materialgram and 64gram based on 5.7x build.

@NickCao NickCao force-pushed the telegram-desktop-webkit branch from 306b8f5 to f258530 Compare November 3, 2024 23:09
@NickCao NickCao changed the title telegram-desktop (and forks): make webkitgtk optional telegram-desktop (and forks): make webkitgtk optional, and update to latest version Nov 3, 2024
@NickCao
Copy link
Member Author

NickCao commented Nov 4, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 353524


x86_64-linux

✅ 4 packages built:
  • _64gram
  • kotatogram-desktop
  • materialgram
  • telegram-desktop

@ilya-fedin
Copy link
Contributor

hmm 🤔

nix-build --expr 'with import ./. { }; kotatogram-desktop.override { withWebkit = false; }'
error:
       … while calling a functor (an attribute set with a '__functor' attribute)

         at «string»:1:22:

            1| with import ./. { }; kotatogram-desktop.override { withWebkit = false; }
             |                      ^

       … while calling a functor (an attribute set with a '__functor' attribute)

         at /home/ilya/nixpkgs/lib/customisation.nix:144:43:

          143|       # Re-call the function but with different arguments
          144|       overrideArgs = mirrorArgs (newArgs: makeOverridable f (overrideWith newArgs));
             |                                           ^
          145|       # Change the result of the function call by applying g to it

       (stack trace truncated; use '--show-trace' to show the full trace)

       error: function 'anonymous lambda' called with unexpected argument 'withWebkit'

       at /home/ilya/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix:1:1:

            1| {
             | ^
            2|   lib,

@NickCao
Copy link
Member Author

NickCao commented Nov 4, 2024

Fixed, in a ugly way...

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 4, 2024
@NickCao
Copy link
Member Author

NickCao commented Nov 4, 2024

@ofborg build _64gram kotatogram-desktop materialgram telegram-desktop

@NickCao NickCao mentioned this pull request Nov 4, 2024
13 tasks
@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label Nov 4, 2024
@ofborg ofborg bot requested review from Aleksanaa, ilya-fedin and oluceps November 4, 2024 14:43
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 4, 2024
@ilya-fedin
Copy link
Contributor

ilya-fedin commented Nov 4, 2024

meh, ofborg seem to not to try to build on darwin while building three times on x86_64-linux (according to https://logs.ofborg.org/?key=nixos/nixpkgs.353524) :(

@wegank wegank added the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Nov 4, 2024
@JohnRTitor
Copy link
Member

@ofborg build _64gram kotatogram-desktop materialgram telegram-desktop

Currently building this on nix community darwin builder.

Copy link
Member

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

johnrtitor@darwin01 ~ % nix build "github:nixos/nixpkgs/refs/pull/353524/merge#_64gram" "github:nixos/nixpkgs/refs/pull/353524/merge#kotatogram-desktop" "github:nixos/nixpkgs/refs/pull/353524/merge#materialgram" "github:nixos/nixpkgs/refs/pull/353524/merge#telegram-desktop" --print-out-paths 

/nix/store/b5h15jgzq6hkqwcdajls8ycnb19jh7wl-64gram-1.1.45
/nix/store/24v6afl6i3ay1v70gd1fvyzsh0ss5mnq-kotatogram-desktop-1.4.9-unstable-2024-09-27
/nix/store/hws4kxa355cdwklvriz3mqnc47ala9na-materialgram-5.7.0.1
/nix/store/90rk4m1v7bpgajvnw0mb8s4n1n74xq0s-telegram-desktop-5.7.1

nix build "github:nixos/nixpkgs/refs/pull/353524/merge#_64gram"      5.78s user 15.87s system 0% cpu 1:32:28.51 total

@NickCao NickCao merged commit 866467e into NixOS:master Nov 4, 2024
@NickCao NickCao deleted the telegram-desktop-webkit branch November 4, 2024 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

8.has: clean-up This PR removes packages or removes other cruft 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants