Merge pull request #34689 from dtzWill/fix/zsh-modern

zsh: set configureFlags and checkFlags at nix level, also fix cross

Changed files
+8 -4
pkgs
shells
+8 -4
pkgs/shells/zsh/default.nix
···
buildInputs = [ ncurses pcre ];
+
configureFlags = [
+
"--enable-maildir-support"
+
"--enable-multibyte"
+
"--with-tcsetpgrp"
+
"--enable-pcre"
+
];
preConfigure = ''
-
configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre"
+
configureFlagsArray+=(--enable-zprofile=$out/etc/zprofile)
'';
# the zsh/zpty module is not available on hydra
# so skip groups Y Z
-
checkFlagsArray = ''
-
(TESTNUM=A TESTNUM=B TESTNUM=C TESTNUM=D TESTNUM=E TESTNUM=V TESTNUM=W)
-
'';
+
checkFlags = map (T: "TESTNUM=${T}") (stdenv.lib.stringToCharacters "ABCDEVW");
# XXX: think/discuss about this, also with respect to nixos vs nix-on-X
postInstall = ''