Skip to content

p11-kit: mark broken if !stdenv.buildPlatform.canExecute stdenv.hostPlatform #246643

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
ghost wants to merge 1 commit into from
Closed

p11-kit: mark broken if !stdenv.buildPlatform.canExecute stdenv.hostPlatform #246643

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pkgs/development/libraries/gnutls/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, unbound, dns-root-data, gettext, util-linux
, cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so
, tpmSupport ? false, trousers, which, nettools, libunistring
, withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit
, withP11-kit ? !stdenv.hostPlatform.isStatic && !p11-kit.meta.broken, p11-kit
, Security # darwin Security.framework
# certificate compression - only zlib now, more possible: zstd, brotli

Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/libraries/p11-kit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,8 @@ stdenv.mkDerivation rec {
];
platforms = platforms.all;
license = licenses.bsd3;

# configure: error: cannot run test program while cross compiling
broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
};
}
5 changes: 3 additions & 2 deletions pkgs/os-specific/linux/systemd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
, bash
, libmicrohttpd
, libfido2
, withP11kit ? !p11-kit.meta.broken
, p11-kit

# the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to be available during build time.
Expand Down Expand Up @@ -322,7 +323,7 @@ stdenv.mkDerivation (finalAttrs: {
{ name = "libdw.so.1"; pkg = opt withCoredump elfutils; }

# Support for PKCS#11 in systemd-cryptsetup, systemd-cryptenroll and systemd-homed
{ name = "libp11-kit.so.0"; pkg = opt (withHomed || withCryptsetup) p11-kit; }
{ name = "libp11-kit.so.0"; pkg = opt ((withHomed || withCryptsetup) && withP11kit) p11-kit; }
];

patchDlOpen = dl:
Expand Down Expand Up @@ -430,7 +431,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional withPCRE2 pcre2
++ lib.optional withSelinux libselinux
++ lib.optional withRemote libmicrohttpd
++ lib.optionals (withHomed || withCryptsetup) [ p11-kit ]
++ lib.optionals ((withHomed || withCryptsetup) && withP11kit) [ p11-kit ]
++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ]
++ lib.optionals withLibBPF [ libbpf ]
++ lib.optional withTpm2Tss tpm2-tss
Expand Down