Merge pull request #233830 from MaxHearnden/zsh

This commit is contained in:
Artturi 2023-06-23 18:51:22 +03:00 committed by GitHub
commit de76a685df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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");