File tree Expand file tree Collapse file tree 1 file changed +12
-20
lines changed Expand file tree Collapse file tree 1 file changed +12
-20
lines changed Original file line number Diff line number Diff line change 22 lib ,
33 stdenv ,
44 mkMesonDerivation ,
5-
6- meson ,
7- ninja ,
8- pkg-config ,
9-
10- jq ,
11- git ,
12- mercurial ,
13- util-linux ,
14- unixtools ,
5+ buildPackages ,
156
167 nix-store ,
178 nix-expr ,
@@ -46,16 +37,17 @@ mkMesonDerivation (
4637 ./.
4738 ] ;
4839
49- # Hack for sake of the dev shell
40+ # Hack for sake of the dev shell. Need to "manually splice" since
41+ # this isn't a specially-recognized list of dependencies.
5042 passthru . externalNativeBuildInputs = [
51- meson
52- ninja
53- pkg-config
54-
55- jq
56- git
57- mercurial
58- unixtools . script
43+ buildPackages . meson
44+ buildPackages . ninja
45+ buildPackages . pkg-config
46+
47+ buildPackages . jq
48+ buildPackages . git
49+ buildPackages . mercurial
50+ buildPackages . unixtools . script
5951 ]
6052 ++ lib . optionals stdenv . hostPlatform . isLinux [
6153 # For various sandboxing tests that needs a statically-linked shell,
@@ -64,7 +56,7 @@ mkMesonDerivation (
6456 # For Overlay FS tests need `mount`, `umount`, and `unshare`.
6557 # For `script` command (ensuring a TTY)
6658 # TODO use `unixtools` to be precise over which executables instead?
67- util-linux
59+ buildPackages . util-linux
6860 ] ;
6961
7062 nativeBuildInputs = finalAttrs . passthru . externalNativeBuildInputs ++ [
You can’t perform that action at this time.
0 commit comments