diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-12-14 21:27:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-14 21:27:28 +0000 |
| commit | 39844d15de972c89c01b0710bbd7daf5ce463dd2 (patch) | |
| tree | 113e3ef0227a5ff89cafbaa5395af6441eae1c5b /pkgs | |
| parent | be7eee47fb732027598080aa661e63156fd1642f (diff) | |
| parent | a2aa9225b6185ab2144dd8f397b0bd429d30c075 (diff) | |
| download | nixlib-39844d15de972c89c01b0710bbd7daf5ce463dd2.tar nixlib-39844d15de972c89c01b0710bbd7daf5ce463dd2.tar.gz nixlib-39844d15de972c89c01b0710bbd7daf5ce463dd2.tar.bz2 nixlib-39844d15de972c89c01b0710bbd7daf5ce463dd2.tar.lz nixlib-39844d15de972c89c01b0710bbd7daf5ce463dd2.tar.xz nixlib-39844d15de972c89c01b0710bbd7daf5ce463dd2.tar.zst nixlib-39844d15de972c89c01b0710bbd7daf5ce463dd2.zip | |
Merge pull request #205958 from Kiskae/patch-2
pkgStatic.dash: fix build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/shells/dash/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 3b362b4bdeee..e9b4093249c5 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; |