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.

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

cargo-tauri.hook: use finalPackage as cargo-tauri #350002

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

TomaSajt
Copy link
Contributor

@TomaSajt TomaSajt commented Oct 20, 2024

This PR simplifies usage of cargo-tauri.hook when cargo-tauri is overridden

This PR should not cause any rebuilds.


The related question that still remains is how to package cargo_tauri_2 and how a cargo-tauri_2 vs cargo-tauri_1 split will work inside pkgs/by-name

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.

Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

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

Thanks! I hadn't thought of something like this before

The related question that still remains is how to package cargo_tauri_2 and how a cargo-tauri_2 vs cargo-tauri_1 split will work inside pkgs/by-name

That's being done in #346277, which this will be a major help in (and should now be merged after this)

pkgs/by-name/ca/cargo-tauri/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/ca/cargo-tauri/package.nix Show resolved Hide resolved
pkgs/by-name/ca/cargo-tauri/package.nix Show resolved Hide resolved
@TomaSajt
Copy link
Contributor Author

Okay, I just put meta into the overrideAttrs, hopefully that's OK.

Copy link
Member

@getchoo getchoo 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 the wait. Moving meta and passthru to the overrideAttrs arguments is fine with me. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants