From 2da974bf8e1b5f74d99a0535a800745bd08b2357 Mon Sep 17 00:00:00 2001 From: Florian Warzecha Date: Mon, 4 Mar 2024 15:04:46 +0100 Subject: [PATCH 1/2] dropbear: fix pkgsStatic build This prevents the glibc.static dependency's build failing with ``` if test -r /build/build/csu/abi-tag.h.new; then mv -f /build/build/csu/abi-tag.h.new /build/build/csu/abi-tag.h; \ else echo >&2 'This configuration not matched in ../abi-tags'; exit 1; fi ``` --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 023639d3910d..687ce08e1f47 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glibc, zlib, libxcrypt +{ lib, stdenv, fetchurl, zlib, libxcrypt , enableStatic ? stdenv.hostPlatform.isStatic , enableSCP ? false , sftpPath ? "/run/current-system/sw/libexec/sftp-server" @@ -49,7 +49,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"; From e9eb20c7570e6e6f39b61e770e290281f7f207c8 Mon Sep 17 00:00:00 2001 From: Florian Warzecha Date: Mon, 1 Apr 2024 17:13:02 +0200 Subject: [PATCH 2/2] dropbear: cleanup static build Co-authored-by: Wolfgang Walther --- pkgs/tools/networking/dropbear/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 687ce08e1f47..f64e51555bdd 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, zlib, libxcrypt -, enableStatic ? stdenv.hostPlatform.isStatic , 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 " ")