alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #62853 from samueldr/fix/sshd-cross-compile-issue

Browse source 
nixos/sshd: fixes validation for cross-compilation
This commit is contained in:
Yegor Timoshenko 2019-06-15 10:37:35 +03:00 committed by GitHub
parent 3ac9699ae2 861bbbcb3c
commit d089f23390
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/services/networking/ssh/sshd.nix
View file

@ -4,7 +4,15 @@ with lib;
let
sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ cfgc.package ]; } ''
# The splicing information needed for nativeBuildInputs isn't available
# on the derivations likely to be used as `cfgc.package`.
# This middle-ground solution ensures *an* sshd can do their basic validation
# on the configuration.
validationPackage = if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform
then [ cfgc.package ]
else [ pkgs.buildPackages.openssh ];
sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ validationPackage ]; } ''
cat >$out <<EOL
${cfg.extraConfig}
EOL