pyrox.dev
Merge pull request #233830 from MaxHearnden/zsh
+7
-1
pkgs/shells/zsh/default.nix
+7
-1
pkgs/shells/zsh/default.nix
···
10
, texinfo
11
, ncurses
12
, pcre
13
, buildPackages }:
14
15
let
···
32
];
33
34
strictDeps = true;
35
-
nativeBuildInputs = [ autoreconfHook perl groff texinfo pcre]
36
++ lib.optionals stdenv.isLinux [ util-linux yodl ];
37
38
buildInputs = [ ncurses pcre ];
···
55
"zsh_cv_sys_dynamic_strip_exe=yes"
56
"zsh_cv_sys_dynamic_strip_lib=yes"
57
];
58
59
# the zsh/zpty module is not available on hydra
60
# so skip groups Y Z
···
10
, texinfo
11
, ncurses
12
, pcre
13
+
, pkg-config
14
, buildPackages }:
15
16
let
···
33
];
34
35
strictDeps = true;
36
+
nativeBuildInputs = [ autoreconfHook perl groff texinfo pkg-config ]
37
++ lib.optionals stdenv.isLinux [ util-linux yodl ];
38
39
buildInputs = [ ncurses pcre ];
···
56
"zsh_cv_sys_dynamic_strip_exe=yes"
57
"zsh_cv_sys_dynamic_strip_lib=yes"
58
];
59
+
60
+
preConfigure = ''
61
+
# use pkg-config instead of pcre-config
62
+
configureFlagsArray+=("PCRECONF=''${PKG_CONFIG} libpcre")
63
+
'';
64
65
# the zsh/zpty module is not available on hydra
66
# so skip groups Y Z