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

upower: fix disabling introspection, systemd #347803

Merged
merged 2 commits into from
Oct 13, 2024

Conversation

alyssais
Copy link
Member

Since #345979, building upower is necessary to build xdg-desktop-portal-gtk, but it wasn't possible for systems that can't use systemd.

I've called the option "withSystemd" as it's the most common name for this kind of option in Nixpkgs, and it's consistent with the package's "withIntrospection" argument (though not "useIMobileDevice").

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.

Since 7f2a6f1 ("xdg-desktop-portal-gtk: Enable all default
portals unconditionally"), building upower is necessary to build
xdg-desktop-portal-gtk, but it wasn't possible for systems that can't
use systemd.

I've called the option "withSystemd" as it's the most common name for
this kind of option in Nixpkgs, and it's consistent with the package's
"withIntrospection" argument (though not "useIMobileDevice").
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

LGTM, thanks.

@alyssais alyssais merged commit 9704a4f into NixOS:master Oct 13, 2024
29 of 30 checks passed
@alyssais alyssais deleted the upower-systemd branch October 13, 2024 09:50
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