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

p11-kit: build with meson #244633

Merged
merged 1 commit into from
Jul 23, 2023
Merged

p11-kit: build with meson #244633

merged 1 commit into from
Jul 23, 2023

Conversation

NickCao
Copy link
Member

@NickCao NickCao commented Jul 21, 2023

Description of changes

replaces #73341, fixes #244111 (comment)

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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.

@NickCao
Copy link
Member Author

NickCao commented Jul 21, 2023

Checked build output, seems ok. Not sure about the now dropped localstatedir flag.

@Mindavi
Copy link
Contributor

Mindavi commented Jul 21, 2023

The localstatedir flags seems relevant, but not sure how it's configured in meson (don't have time to check now)

Copy link
Member

Choose a reason for hiding this comment

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

p11_system_config_modules in pkg-config file changed $out/share/p11-kit/modules /etc/pkcs11/modules, not sure if it is an issue.

Copy link
Member Author

Choose a reason for hiding this comment

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

$out/share/p11-kit/modules seems empty, I assume /etc/pkcs11/modules might be the intended path?

Copy link
Member Author

Choose a reason for hiding this comment

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

The variable is reference in meson.build of gcr, but still not used else where https://github.com/GNOME/gcr/blob/c8d2e0f44bdb91b63ed04dedf7b272211dc46c6e/meson.build#L56

Copy link
Member Author

Choose a reason for hiding this comment

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

configureFlags = [
"--enable-doc"
"--sysconfdir=/etc"
"--localstatedir=/var"
Copy link
Member

Choose a reason for hiding this comment

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

It would be passed the same way to mesonFlags but it does not look like it is used. The only reference I found with git log -G is hardcoded in https://github.com/p11-glue/p11-kit/blob/d98392beb309570c228090866d77e500bc9e30db/common/runtime.c#L51

Copy link
Member Author

Choose a reason for hiding this comment

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

The p11_get_runtime_directory function and in turn the whole codebase contains no reference to localstatedir, I'm pretty sure it's unused.

@NickCao NickCao merged commit 9d44a85 into NixOS:staging Jul 23, 2023
@NickCao NickCao deleted the p11-kit branch July 23, 2023 11:36
@ghost ghost mentioned this pull request Aug 2, 2023
12 tasks
chvp added a commit to chvp/nixpkgs that referenced this pull request Aug 11, 2023
Since NixOS#244633, the installation path for
p11-kit was picked up to be in the p11-kit out path, which obviously doesn't
work. This commit restores the out path to the value it was before
NixOS#244633.
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