From a2aa9225b6185ab2144dd8f397b0bd429d30c075 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 13 Dec 2022 20:47:26 +0100 Subject: pkgStatic.dash: fix build `libedit` declares a dependency on `libncurses`, but since dash doesn't use pkg-config it doesn't register the transitive dependencies. --- pkgs/shells/dash/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/shells') diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 3b362b4bdeee5..e9b4093249c53 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPackages , autoreconfHook +, pkg-config , fetchurl , fetchpatch , libedit @@ -37,12 +38,16 @@ stdenv.mkDerivation rec { strictDeps = true; # configure.ac patched; remove on next release - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optionals stdenv.hostPlatform.isStatic [ pkg-config ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ libedit ]; configureFlags = [ "--with-libedit" ]; + preConfigure = lib.optional stdenv.hostPlatform.isStatic '' + export LIBS="$(pkg-config --libs --static libedit)" + ''; enableParallelBuilding = true; -- cgit 1.4.1