systemd: add openssl as explicit buildInput#370076
systemd: add openssl as explicit buildInput#370076ElvishJerricco merged 1 commit intoNixOS:stagingfrom
Conversation
github-actions
bot
added
the
6.topic: systemd
|
The condition for |
So that we assert, that when withHomed is true, we need to have set withOpenSSL? |
|
If I understand correctly, something like: assert withHomed -> withOpenssl;
assert withFido2 -> withOpenssl;
assert withSysupdate -> withOpenssl;
assert withImportd -> (wantGcrypt || withOpenssl);
assert withOpenssl -> !wantGcrypt;Or something like that. |
Shawn8901
force-pushed
the
fix-systemd-openssl
branch
from
06e7dbd to
55d9068
Compare
github-actions
bot
added
10.rebuild-darwin: 1-10
ambroisie
left a comment
ambroisie
left a comment
There was a problem hiding this comment.
Are withGcrypt = true and withOpenssl = true compatible?
|
Applied that refactor. While checking the meson.build i did not find any evidence that resolved actually requires gcrypt ( https://github.com/systemd/systemd/blob/89c4fe6c211d5e9cb380329f638609dec26bed0a/meson.build#L3110 ), tho i have removed that. (edit: The meson file also states kinda that both gcrypt and openssl are supported, tho gcrypt is preferred when available https://github.com/systemd/systemd/blob/89c4fe6c211d5e9cb380329f638609dec26bed0a/meson.build#L1537 ) Importd supports both openssl or gcrypt according the meson.build ( https://github.com/systemd/systemd/blob/89c4fe6c211d5e9cb380329f638609dec26bed0a/meson.build#L1639 ) So i switched the gcrypt to a withGcrypt to comply with the other options. |
|
i has build my system with that and the over-written config from the related issue (minus coredump support, which i kept enabled). Seeing no issue with my build, so i am undrafting. |
ElvishJerricco
left a comment
ElvishJerricco
left a comment
There was a problem hiding this comment.
I'm pretty sure systemdMinimal needs to set withOpenssl = false; and withGcrypt = false;, right?
Shawn8901
force-pushed
the
fix-systemd-openssl
branch
from
55d9068 to
52017a4
Compare
seems absolutely reasonable. amended that into the commit. |
3 participants
fixes #369446
openssl is propagated by libfido2, which breaks systemd compliation in case fido support is disabled.
importd should enable openssl if gcrypt is disabled https://github.com/systemd/systemd/blob/89c4fe6c211d5e9cb380329f638609dec26bed0a/meson.build#L1637
I am still building, tho i already wanted to create the pr to gather feedback from the issue creator. Aside already that every feedback is welcome.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.