mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-22 05:56:15 +02:00
Merge nativeCheckInputs
into nativeBuildInputs
They were getting skipped for the test-against checks.
This commit is contained in:
parent
c3e9e3d0c3
commit
04836c73e5
1 changed files with 4 additions and 6 deletions
10
package.nix
10
package.nix
|
@ -209,6 +209,10 @@ in {
|
||||||
(lib.getBin lowdown)
|
(lib.getBin lowdown)
|
||||||
mdbook
|
mdbook
|
||||||
mdbook-linkcheck
|
mdbook-linkcheck
|
||||||
|
] ++ lib.optionals doInstallCheck [
|
||||||
|
git
|
||||||
|
mercurial
|
||||||
|
openssh
|
||||||
] ++ lib.optionals (doInstallCheck || enableManual) [
|
] ++ lib.optionals (doInstallCheck || enableManual) [
|
||||||
jq # Also for custom mdBook preprocessor.
|
jq # Also for custom mdBook preprocessor.
|
||||||
] ++ lib.optional stdenv.hostPlatform.isLinux util-linux
|
] ++ lib.optional stdenv.hostPlatform.isLinux util-linux
|
||||||
|
@ -249,12 +253,6 @@ in {
|
||||||
dontBuild = !attrs.doBuild;
|
dontBuild = !attrs.doBuild;
|
||||||
doCheck = attrs.doCheck;
|
doCheck = attrs.doCheck;
|
||||||
|
|
||||||
nativeCheckInputs = [
|
|
||||||
git
|
|
||||||
mercurial
|
|
||||||
openssh
|
|
||||||
];
|
|
||||||
|
|
||||||
disallowedReferences = [ boost ];
|
disallowedReferences = [ boost ];
|
||||||
|
|
||||||
preConfigure = lib.optionalString (doBuild && ! stdenv.hostPlatform.isStatic) (
|
preConfigure = lib.optionalString (doBuild && ! stdenv.hostPlatform.isStatic) (
|
||||||
|
|
Loading…
Reference in a new issue