openssh: remove softhsm ref when cross-compiling

Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

softhsm is used for tests, which don't run when cross-compiling, but it
was accidentally included anyway due to a mistake in the preCheck
conditionals. This fixes the cross build on armv6l.

Ben Wolsieffer 7 months ago 0de27edf ff774a42

+4 -3

1 changed file

expand all

unified split

pkgs

tools

networking

openssh

common.nix

+4 -3

pkgs/tools/networking/openssh/common.nix

··· 146 146 ++ lib.optional (!stdenv.hostPlatform.isDarwin) hostname 147 147 ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) softhsm; 148 148 149 - preCheck = 150 - lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' 149 + preCheck = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ( 150 + '' 151 151 # construct a dummy HOME 152 152 export HOME=$(realpath ../dummy-home) 153 153 mkdir -p ~/.ssh ··· 197 197 # The extra tests check PKCS#11 interactions, which softhsm emulates with software only 198 198 substituteInPlace regress/test-exec.sh \ 199 199 --replace /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so 200 - ''; 200 + '' 201 + ); 201 202 # integration tests hard to get working on darwin with its shaky 202 203 # sandbox 203 204 # t-exec tests fail on musl