Skip to content
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

Jump to bottom

openssh: fix static build #100906

Merged
merged 2 commits into from Dec 8, 2020
Merged

openssh: fix static build #100906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89e9c49
keyutils: fix static build
KAction Oct 17, 2020
4879ea9
openssh: fix static build
KAction Oct 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkgs/os-specific/linux/keyutils/default.nix
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
./conf-symlink.patch
];

makeFlags = stdenv.lib.optionals stdenv.hostPlatform.isStatic "NO_SOLIB=1";

BUILDDATE = "1970-01-01";
outputs = [ "out" "lib" "dev" ];

Expand Down
20 changes: 19 additions & 1 deletion pkgs/tools/networking/openssh/default.nix
View file
Open in desktop
Expand Up @@ -63,7 +63,9 @@ stdenv.mkDerivation rec {
substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
'';

nativeBuildInputs = [ pkgconfig ] ++ optional (hpnSupport || withGssapiPatches) autoreconfHook;
nativeBuildInputs = [ pkgconfig ]
++ optional (hpnSupport || withGssapiPatches) autoreconfHook
++ optional withKerberos kerberos.dev;
buildInputs = [ zlib openssl libedit pam ]
++ optional withFIDO libfido2
++ optional withKerberos kerberos;
Expand All @@ -72,6 +74,22 @@ stdenv.mkDerivation rec {
# Setting LD causes `configure' and `make' to disagree about which linker
# to use: `configure' wants `gcc', but `make' wants `ld'.
unset LD
''
# Upstream build system does not support static build, so we fall back
# on fragile patching of configure script.
#
# libedit is found by pkgconfig, but without --static flag, required
# to get also transitive dependencies for static linkage, hence sed
# expression.
#
# Kerberos can be found either by krb5-config or by fall-back shell
# code in openssh's configure.ac. Neither of them support static
# build, but patching code for krb5-config is simpler, so to get it
# into PATH, kerberos.dev is added into buildInputs.
+ optionalString stdenv.hostPlatform.isStatic ''
sed -i "s,PKGCONFIG --libs,PKGCONFIG --libs --static,g" configure
sed -i 's#KRB5CONF --libs`#KRB5CONF --libs` -lkrb5support -lkeyutils#g' configure
sed -i 's#KRB5CONF --libs gssapi`#KRB5CONF --libs gssapi` -lkrb5support -lkeyutils#g' configure
'';

# I set --disable-strip because later we strip anyway. And it fails to strip
Expand Down