talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

openssh: remove softhsm ref when cross-compiling (#431783)

Browse Source
This commit is contained in:
Colin 2025-08-15 18:56:28 +00:00 committed by GitHub
commit 65f27c32c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/networking/openssh/common.nix
View File

@ -146,8 +146,8 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional (!stdenv.hostPlatform.isDarwin) hostname
++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) softhsm;
preCheck =
lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
preCheck = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
''
# construct a dummy HOME
export HOME=$(realpath ../dummy-home)
mkdir -p ~/.ssh
@ -197,7 +197,8 @@ stdenv.mkDerivation (finalAttrs: {
# The extra tests check PKCS#11 interactions, which softhsm emulates with software only
substituteInPlace regress/test-exec.sh \
--replace /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so
'';
''
);
# integration tests hard to get working on darwin with its shaky
# sandbox
# t-exec tests fail on musl