cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #293263 from liketechnik/fix/dropbear-static

Browse source 
dropbear: fix pkgsStatic build
This commit is contained in:
John Ericson 2024-04-01 12:18:38 -04:00 committed by GitHub
commit a3eaa2051d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/tools/networking/dropbear/default.nix
View file

@ -1,5 +1,4 @@
{ lib, stdenv, fetchurl, glibc, zlib, libxcrypt
, enableStatic ? stdenv.hostPlatform.isStatic
{ lib, stdenv, fetchurl, zlib, libxcrypt
, enableSCP ? false
, sftpPath ? "/run/current-system/sw/libexec/sftp-server"
}:
@ -23,9 +22,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-vFoSH/vJS1FxrV6+Ab5CdG1Qqnl8lUmkY5iUoWdJRDs=";
};
dontDisableStatic = enableStatic;
configureFlags = lib.optional enableStatic "LDFLAGS=-static";
CFLAGS = lib.pipe (lib.attrNames dflags) [
(builtins.map (name: "-D${name}=\\\"${dflags.${name}}\\\""))
(lib.concatStringsSep " ")
@ -49,7 +45,7 @@ stdenv.mkDerivation rec {
./pass-path.patch
];
buildInputs = [ zlib libxcrypt ] ++ lib.optionals enableStatic [ glibc.static zlib.static ];
buildInputs = [ zlib libxcrypt ];
meta = with lib; {
description = "A small footprint implementation of the SSH 2 protocol";