diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-06 19:56:54 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-06 20:14:52 -0600 |
| commit | 2b8e900403ac104ae0ae3c0f5c04379a115b5777 (patch) | |
| tree | b836b623025c0cef0d31c7100e7390db55951ef3 /pkgs | |
| parent | fc1224d55dfdde0a3e43635fc9465cdff0bb80a3 (diff) | |
| download | nixlib-2b8e900403ac104ae0ae3c0f5c04379a115b5777.tar nixlib-2b8e900403ac104ae0ae3c0f5c04379a115b5777.tar.gz nixlib-2b8e900403ac104ae0ae3c0f5c04379a115b5777.tar.bz2 nixlib-2b8e900403ac104ae0ae3c0f5c04379a115b5777.tar.lz nixlib-2b8e900403ac104ae0ae3c0f5c04379a115b5777.tar.xz nixlib-2b8e900403ac104ae0ae3c0f5c04379a115b5777.tar.zst nixlib-2b8e900403ac104ae0ae3c0f5c04379a115b5777.zip | |
zsh: set configureFlags and checkFlags at nix level, also fix cross
As-is the use of 'configureFlags="..."' breaks cross compilation as it drops the configure platforms arguments. Set zprofile separately to handle $out.
Diffstat (limited to 'pkgs')
| -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 = '' |