swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #219308 from erdnaxe/openssh-strictdeps

Browse source 
openssh: enable strictDeps
This commit is contained in:
Janne Heß 2023-03-03 09:38:16 +01:00 committed by GitHub
parent f055ce8af7 284e7c020b
commit 65b7c9585d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/tools/networking/openssh/common.nix
View file

@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711' substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
''; '';
strictDeps = true;
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
# This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is
# needed here to access krb5-config in order to cross compile. See: # needed here to access krb5-config in order to cross compile. See:
@ -96,7 +97,7 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
enableParallelChecking = false; enableParallelChecking = false;
nativeCheckInputs = lib.optional (!stdenv.isDarwin) hostname; nativeCheckInputs = [ openssl ] ++ lib.optional (!stdenv.isDarwin) hostname;
preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
# construct a dummy HOME # construct a dummy HOME
export HOME=$(realpath ../dummy-home) export HOME=$(realpath ../dummy-home)