-
-
Notifications
You must be signed in to change notification settings - Fork 15.1k
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
p11-kit: build with meson #244633
Conversation
Checked build output, seems ok. Not sure about the now dropped localstatedir flag. |
The localstatedir flags seems relevant, but not sure how it's configured in meson (don't have time to check now) |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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" |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
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.
Description of changes
replaces #73341, fixes #244111 (comment)
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)