Skip to content

WIP p11-kit: use meson #73341

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.

Sign up for GitHub

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

Closed
FRidh wants to merge 1 commit into from
Closed

WIP p11-kit: use meson #73341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions pkgs/development/libraries/p11-kit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which
, gettext, libffi, libiconv, libtasn1
{ stdenv, fetchFromGitHub, fetchpatch, meson, pkgconfig, which
, gettext, libffi, libiconv, libtasn1, ninja
}:

stdenv.mkDerivation rec {
Expand All @@ -16,17 +16,12 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev"];
outputBin = "dev";

nativeBuildInputs = [ autoreconfHook pkgconfig which ];
Copy link
Member

@jtojnar jtojnar Nov 13, 2019

Choose a reason for hiding this comment

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

Is which used by the build? Meson’s find_program should not need it.

nativeBuildInputs = [ meson pkgconfig which ninja ];
buildInputs = [ gettext libffi libiconv libtasn1 ];
Copy link
Member

@jtojnar jtojnar Nov 13, 2019

Choose a reason for hiding this comment

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

Do we need gettext at run time, or should this go to nativeBuildInputs?

Copy link
Contributor

@worldofpeace worldofpeace Nov 13, 2019

Choose a reason for hiding this comment

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

Conveniently there's info about gettext at https://p11-glue.github.io/p11-glue/p11-kit/manual/devel-building.html#devel-building-unix

Copy link
Member

@jtojnar jtojnar Jan 22, 2022

Choose a reason for hiding this comment

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

Oh, then it should actually be libintl.


autoreconfPhase = ''
NOCONFIGURE=1 ./autogen.sh
'';

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

@FRidh FRidh Nov 13, 2019

Choose a reason for hiding this comment

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

there does not appear to be a meson option for this one

"--without-trust-paths"
Copy link
Member

@jtojnar jtojnar Nov 13, 2019

Choose a reason for hiding this comment

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

Is this option no longer necessary with Meson?

mesonFlags = [
"-Dsystem_config=${placeholder "out"}/etc"
Copy link
Member

@jtojnar jtojnar Nov 13, 2019

Choose a reason for hiding this comment

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

This should probably be

Suggested change
"-Dsystem_config=${placeholder "out"}/etc"
"-Dsystem_config=${placeholder "out"}/etc/pkcs11"

https://github.com/p11-glue/p11-kit/blob/ef2716d18e1098effb8f3a90653c6264b2fec426/meson.build#L288-L291

Copy link
Member

@jtojnar jtojnar Nov 13, 2019

Choose a reason for hiding this comment

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

No matter what, we will need to patch https://github.com/p11-glue/p11-kit/blob/17b2edb1354c5d5080172af45ce55408c5e51d59/p11-kit/meson.build#L27-L28 to /etc/…, or (probably better) drop -Dsystem_config and patch https://github.com/p11-glue/p11-kit/blob/17b2edb1354c5d5080172af45ce55408c5e51d59/p11-kit/meson.build#L320 to $out/etc.

"-Dsystemd=disabled"
]; # TODO: store trust anchors in a directory common to Nix and NixOS

enableParallelBuilding = true;
Copy link
Member

@jtojnar jtojnar Nov 13, 2019

Choose a reason for hiding this comment

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

This can be removed. Meson builds in parallel by default.

Copy link
Member

@jtojnar jtojnar Nov 13, 2019

Choose a reason for hiding this comment

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

So can installFlags. ninja install does not allow overriding variables.

Expand Down