diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-02-09 09:29:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 09:29:32 +0000 |
| commit | a1fe3ee2f93a98c4b7f2e590e000965e4682a6c5 (patch) | |
| tree | efad87fe798dbe7319bf955a6ebf81c71dcb27cd /pkgs/shells | |
| parent | a0a32980918d311a1b45fa4dbeedadedb37ad7cd (diff) | |
| parent | 2b8e900403ac104ae0ae3c0f5c04379a115b5777 (diff) | |
| download | nixlib-a1fe3ee2f93a98c4b7f2e590e000965e4682a6c5.tar nixlib-a1fe3ee2f93a98c4b7f2e590e000965e4682a6c5.tar.gz nixlib-a1fe3ee2f93a98c4b7f2e590e000965e4682a6c5.tar.bz2 nixlib-a1fe3ee2f93a98c4b7f2e590e000965e4682a6c5.tar.lz nixlib-a1fe3ee2f93a98c4b7f2e590e000965e4682a6c5.tar.xz nixlib-a1fe3ee2f93a98c4b7f2e590e000965e4682a6c5.tar.zst nixlib-a1fe3ee2f93a98c4b7f2e590e000965e4682a6c5.zip | |
Merge pull request #34689 from dtzWill/fix/zsh-modern
zsh: set configureFlags and checkFlags at nix level, also fix cross
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 4b2b79a21046..43b766fdaf2e 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -20,15 +20,19 @@ stdenv.mkDerivation { 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 = '' |