zsh: fix cross by using pkg-config to discover libpcre
The configure script calls pcre-config to find pcre however using nativeBuildInputs for this meant that zsh found the native libraries. weirdly only pkgsCross.armv7l-hf-multiplatform.zsh was failing and not pkgsCross.aarch64-multiplatform.zsh
This commit is contained in:
parent
f91ee3065d
commit
77f84f07c4
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue