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

nixos/flatpak: add package option #331993

Merged

Conversation

networkException
Copy link
Member

Description of changes

This pull request adds the services.flatpak.package option to allow overriding the package added by this module to environment.systemPackages and the likes.

This is useful in scenarios where applications call the flatpak binary to query information like writable directories and there is a custom package returning different results from the vanilla binary.

See https://github.com/crabdancing/nixpak-flatpak-wrapper

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.

this patch adds the `services.flatpak.package` option to
allow overriding the package added by this module to
`environment.systemPackages` and the likes.

This is useful in scenarios where applications call the
flatpak binary to query information like writable directories
and there is a custom package returning different results
from the vanilla binary.

See https://github.com/crabdancing/nixpak-flatpak-wrapper
networkException added a commit to networkException/nixpak-flatpak-wrapper that referenced this pull request Aug 3, 2024
Instead of adding the wrapper package to `environment.systemPackages`
and the likes ourselves, we now use the `services.flatpak.package`
option.

See NixOS/nixpkgs#331993
@networkException networkException added the backport release-24.05 Backport PR automatically label Aug 3, 2024
Copy link
Member

@jopejoe1 jopejoe1 left a comment

Choose a reason for hiding this comment

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

LGTM!

@Aleksanaa Aleksanaa merged commit 280d879 into NixOS:master Aug 3, 2024
27 checks passed
Copy link
Contributor

github-actions bot commented Aug 3, 2024

Successfully created backport PR for release-24.05:

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