Skip to content

eid-mw: fix build by restoring p11-kit module installation path#248103

Merged
NickCao merged 1 commit intoNixOS:masterfrom
chvp:fix/eid-mw-build
Aug 13, 2023
Merged

eid-mw: fix build by restoring p11-kit module installation path#248103
NickCao merged 1 commit intoNixOS:masterfrom
chvp:fix/eid-mw-build

Conversation

@chvp
Copy link
Member

@chvp chvp commented Aug 9, 2023

Description of changes

Since #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 installation path to the value it was before #244633.

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.

@ofborg ofborg bot requested a review from bfortz August 9, 2023 08:58
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Aug 9, 2023
@NickCao
Copy link
Member

NickCao commented Aug 10, 2023

Since #244633, the installation path for p11-kit was picked up to be in the p11-kit out path, which obviously doesn't work.

May you explain this further to see it we can fix this in p11-kit itself.

@chvp
Copy link
Member Author

chvp commented Aug 10, 2023

To be honest, I don't fully understand it myself. I assume that meson generates the pkgconfig files a bit differently, but I didn't (and don't) have the time at the moment to do a full deep dive.

@NickCao
Copy link
Member

NickCao commented Aug 11, 2023

Checked https://p11-glue.github.io/p11-glue/p11-kit/manual/devel-paths.html, so PKCS#11 modules ought to install files into p11_module_configs, which isn't possible in nixpkgs, the current patching method is ok. Just move it to postPatch.

@chvp
Copy link
Member Author

chvp commented Aug 11, 2023

It can't be moved to postPatch, autoreconfHook has to run first.

@NickCao
Copy link
Member

NickCao commented Aug 11, 2023

It can't be moved to postPatch, autoreconfHook has to run first.

You can patch configure.ac which is in turn used to generate configure.

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.
@chvp chvp force-pushed the fix/eid-mw-build branch from adb3cd1 to 624b952 Compare August 11, 2023 14:29
@chvp
Copy link
Member Author

chvp commented Aug 11, 2023

It can't be moved to postPatch, autoreconfHook has to run first.

You can patch configure.ac which is in turn used to generate configure.

Done

@NickCao NickCao merged commit 3014a08 into NixOS:master Aug 13, 2023
@chvp chvp deleted the fix/eid-mw-build branch August 18, 2023 09:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants