b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #233830 from MaxHearnden/zsh

Browse source
This commit is contained in:
Artturi 2023-06-23 18:51:22 +03:00 committed by GitHub
parent 82e472577c 77f84f07c4
commit de76a685df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/shells/zsh/default.nix
View file

@ -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");