diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-12-15 00:02:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-15 00:02:26 +0000 |
| commit | 58a71457f728a0a871b6846cb8bb4460f2aadac2 (patch) | |
| tree | 4c33f6b6845181f2b3260efc3fe6e193aaaae1f6 /pkgs/shells | |
| parent | eb81abe9c0f1184d2410780e7e440469887b80ba (diff) | |
| parent | e48cc5222407f9cd163e4f379755d09da15a5dd6 (diff) | |
| download | nixlib-58a71457f728a0a871b6846cb8bb4460f2aadac2.tar nixlib-58a71457f728a0a871b6846cb8bb4460f2aadac2.tar.gz nixlib-58a71457f728a0a871b6846cb8bb4460f2aadac2.tar.bz2 nixlib-58a71457f728a0a871b6846cb8bb4460f2aadac2.tar.lz nixlib-58a71457f728a0a871b6846cb8bb4460f2aadac2.tar.xz nixlib-58a71457f728a0a871b6846cb8bb4460f2aadac2.tar.zst nixlib-58a71457f728a0a871b6846cb8bb4460f2aadac2.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/shells')
| -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; |