Skip to content

libfido2: Add openssl to propagatedBuildInputs#184510

Merged
ck3d merged 1 commit intoNixOS:stagingfrom
zhaofengli:libfido2-propagated-input
Aug 4, 2022
Merged

libfido2: Add openssl to propagatedBuildInputs#184510
ck3d merged 1 commit intoNixOS:stagingfrom
zhaofengli:libfido2-propagated-input

Conversation

@zhaofengli
Copy link
Member

Description of changes

The pkgconfig requires libcrypto. In the minimal systemdStage1, openssl isn't pulled in by existing dependencies so the probe for libfido2 fails:

$ nix-shell -A systemdStage1

[nix-shell:~/Git/nixpkgs]$ pkg-config --debug libfido2
[...]
Adding 'libfido2' to list of known packages
Searching for 'libfido2' requirement 'libcrypto'
Looking for package 'libcrypto'
Looking for package 'libcrypto-uninstalled'

[nix-shell:~/Git/nixpkgs]$ echo $?
1

So despite being enabled, FIDO2 support isn't actually built at all:

$ nix-build -A systemdStage1
/nix/store/zs5svndbbi0m6iygwnxw0xhn5vynk8jb-systemd-stage-1-250.4

$ ls result/lib/cryptsetup/
libcryptsetup-token-systemd-tpm2.so

After the change:

$ nix-build -A systemdStage1
/nix/store/z1w0qwn5bz16i0qh41sf0ab7nlfgjy1m-systemd-stage-1-250.4

$ ls result/lib/cryptsetup/
libcryptsetup-token-systemd-fido2.so  libcryptsetup-token-systemd-tpm2.so

#179823 is required for TPM2 and FIDO2 support to be actually usable, but I think we can merge this now while that PR is being discussed.

Things done
  • Built on platform(s)
    • x86_64-linux (on master)
    • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@zhaofengli zhaofengli force-pushed the libfido2-propagated-input branch from 26a3d03 to 272864d Compare August 3, 2022 21:50
@ofborg ofborg bot requested review from dtzWill and prusnak August 3, 2022 22:35
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Aug 3, 2022
@bobby285271 bobby285271 added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Aug 4, 2022
@ck3d ck3d merged commit 702fb0b into NixOS:staging Aug 4, 2022
@zhaofengli zhaofengli deleted the libfido2-propagated-input branch August 4, 2022 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants