Skip to content
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.

Sign up for GitHub

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

Jump to bottom

dorion: 5.0.1 → 5.1.0; dorion: build from source #265771

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

dorion: 5.0.1 → 5.1.0; dorion: build from source #265771

wants to merge 1 commit into from

Conversation

nyabinary
Copy link
Contributor

@nyabinary nyabinary commented Nov 6, 2023 •
edited
Loading

Description of changes

Build from source
Tauri patched to remove its hard-coded resource directory
Enable WebkitGTK Experimental toggle for WebRTC (To make VCs work)
Added myself to maintainer
Depends on #280554
Obligatory: #327063

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/)
  • 23.11 Release Notes (or backporting 23.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.

Huge thanks to @lilyinstarlight this PR wouldn't be possible without her.

pbsds
pbsds reviewed Nov 10, 2023
View reviewed changes
Copy link
Member

@pbsds pbsds left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Impressive! Considering SpikeHD/Dorion#125 is a thing, I consider this PR a ZHF fix. #265948
Runs fine, but a bit more sluggish than the official client. Likely a tauri issue.

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/do/dorion/package.nix Show resolved Hide resolved
pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved
@nyabinary nyabinary changed the title dorion: 1.2.1 -> 2.1.0 dorion: 1.2.1 -> 2.2.0 Nov 10, 2023
@nyabinary nyabinary changed the title dorion: 1.2.1 -> 2.2.0 dorion: 1.2.1 -> 2.2.1 Nov 10, 2023
pbsds
pbsds reviewed Nov 13, 2023
View reviewed changes
Copy link
Member

@pbsds pbsds left a comment

Choose a reason for hiding this comment

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

Sorry for appearing nitpicky, you have done an excellent job. The proposed set of substitutions IMO clearly convey their intent

pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved
pbsds
pbsds reviewed Nov 18, 2023
View reviewed changes
Copy link
Member

@pbsds pbsds left a comment

Choose a reason for hiding this comment

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

We seem to have a build failure, the proposed fix works on my end

pkgs/by-name/do/dorion/package.nix Show resolved Hide resolved
pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/do/dorion/package.nix Outdated Show resolved Hide resolved
@pbsds
Copy link
Member

pbsds commented Nov 19, 2023

More build failures: unable to parse JSON Tauri config file at /build/source/src-tauri/tauri.conf.json because trailing comma at line 71 column 7

@nyabinary
Copy link
Contributor Author

More build failures: unable to parse JSON Tauri config file at /build/source/src-tauri/tauri.conf.json because trailing comma at line 71 column 7

pain
what could be causing this tho?

@nyabinary nyabinary marked this pull request as draft December 19, 2023 15:21
@wegank wegank changed the title dorion: 1.2.1 -> 2.2.1 dorion: 1.2.1 -> 2.2.1, build from source Jan 3, 2024
@wegank wegank mentioned this pull request Jan 3, 2024
Closed
1 task
@nyabinary nyabinary force-pushed the dorion branch 2 times, most recently from a1ed935 to 68a67f3 Compare January 12, 2024 15:45
@nyabinary
Copy link
Contributor Author

#335751 somewhat related :P

@pbsds
Copy link
Member

pbsds commented Sep 12, 2024 •
edited
Loading 

dorion> rm: cannot remove '../.cargo/config.toml': Permission denied

same on ofborg: https://logs.ofborg.org/?key=nixos/nixpkgs.265771&attempt_id=cab0ee99-c379-43cb-a4a5-9e496aaf678a

@nyabinary
Copy link
Contributor Author 

dorion> rm: cannot remove '../.cargo/config.toml': Permission denied

same on ofborg: https://logs.ofborg.org/?key=nixos/nixpkgs.265771&attempt_id=cab0ee99-c379-43cb-a4a5-9e496aaf678a

Any idea what is preventing it from rming the file?

@pbsds
Copy link
Member

pbsds commented Sep 13, 2024

Consider chmod +w, if it is not a symlink to the store.

@Artturin
Copy link
Member

There's merge conflicts

@nyabinary
Copy link
Contributor Author

There's merge conflicts

fixed :3

@ofborg ofborg bot requested a review from Aleksanaa September 18, 2024 21:50
@pbsbot
Copy link

pbsbot commented Sep 19, 2024

Result of nixpkgs-review pr 265771 run on x86_64-linux 1

1 package built:
  • dorion

@pbsds
Copy link
Member

pbsds commented Sep 19, 2024 •
edited
Loading

Seems to run fine 👍, but the desktop entry and icons are now gone compared to the non-from-source dorion

@nyabinary
Copy link
Contributor Author

Seems to run fine 👍, but the desktop entry and icons are now gone compared to the non-from-source dorion

Do you know how to fix that, can't really debug (or fix it rn) so would appreciate it if you could :3

@pbsds
Copy link
Member

pbsds commented Sep 20, 2024

https://github.com/SpikeHD/Dorion/blob/a314e41ac6caeb1b257d723bcdf8071b2348cd5e/flatpak/com.spikehd.dorion.yml#L33-L34

@nyabinary
Copy link
Contributor Author

https://github.com/SpikeHD/Dorion/blob/a314e41ac6caeb1b257d723bcdf8071b2348cd5e/flatpak/com.spikehd.dorion.yml#L33-L34

Where would I need to add these two lines? 😅

@pbsds
Copy link
Member

pbsds commented Sep 23, 2024

postInstall i reckon :)

@Anomalocaridid
Copy link
Contributor

Dorion updated a few times since this PR was made. Its latest version is v6.1.0 and it has also started using Tauri v2 (since v6.0.0), which lets it take advantage of webkitgtk compiled with webrtc support.

Also, would it be possible to override Dorion's webkitgtk dependency to be compiled with experimental features so it can support webrtc?

@nyabinary nyabinary force-pushed the dorion branch 2 times, most recently from ba533da to 076a860 Compare October 6, 2024 16:13
@nyabinary nyabinary changed the title dorion: build from source dorion: 5.0.1 → 5.1.0; dorion: build from source Oct 6, 2024
@nyabinary
Copy link
Contributor Author

There is a permission error now that I can't seem to solve if anyone wants to chip in :P

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Artturin Artturin Artturin left review comments

@AndersonTorres AndersonTorres AndersonTorres approved these changes

@lilyinstarlight lilyinstarlight Awaiting requested review from lilyinstarlight

@Aleksanaa Aleksanaa Awaiting requested review from Aleksanaa

@pbsds pbsds Awaiting requested review from pbsds

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@nyabinary @pbsds @AndersonTorres @nixos-discourse @Artturin @pbsbot @Anomalocaridid @lilyinstarlight @SuperSandro2000 @wegank