JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
As-is the use of 'configureFlags="..."' breaks cross compilation
as it drops the configure platforms arguments.

Set zprofile separately to handle $out.
This commit is contained in:
Will Dietz 2018-02-06 19:56:54 -06:00
parent fc1224d55d
commit 2b8e900403
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/shells/zsh/default.nix
View File

@ -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 = ''