diff options
| author | Artturi <Artturin@artturin.com> | 2023-06-23 18:51:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 18:51:22 +0300 |
| commit | de76a685df210cae8a3f824da4f2f6550e050d99 (patch) | |
| tree | 787c19257c539e027fc64d030ab135d7e671e7ae /pkgs/shells/zsh | |
| parent | 82e472577cf9d4cc3b5c40d5105af8fab77509f9 (diff) | |
| parent | 77f84f07c47737d66445c5aa32a3740d1f91e0fa (diff) | |
Merge pull request #233830 from MaxHearnden/zsh
Diffstat (limited to 'pkgs/shells/zsh')
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 18fa69c604272..1a085c0e062ca 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -10,6 +10,7 @@ , texinfo , ncurses , pcre +, pkg-config , buildPackages }: let @@ -32,7 +33,7 @@ stdenv.mkDerivation { ]; strictDeps = true; - nativeBuildInputs = [ autoreconfHook perl groff texinfo pcre] + nativeBuildInputs = [ autoreconfHook perl groff texinfo pkg-config ] ++ lib.optionals stdenv.isLinux [ util-linux yodl ]; buildInputs = [ ncurses pcre ]; @@ -56,6 +57,11 @@ stdenv.mkDerivation { "zsh_cv_sys_dynamic_strip_lib=yes" ]; + preConfigure = '' + # use pkg-config instead of pcre-config + configureFlagsArray+=("PCRECONF=''${PKG_CONFIG} libpcre") + ''; + # the zsh/zpty module is not available on hydra # so skip groups Y Z checkFlags = map (T: "TESTNUM=${T}") (lib.stringToCharacters "ABCDEVW"); |