Merge pull request #220030 from Artturin/write-shell-application-lighter
This commit is contained in:
commit
db6255c185
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck }:
|
||||
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck, haskell }:
|
||||
|
||||
let
|
||||
inherit (lib)
|
||||
|
@ -341,7 +341,9 @@ rec {
|
|||
if checkPhase == null then ''
|
||||
runHook preCheck
|
||||
${stdenv.shellDryRun} "$target"
|
||||
${lib.getExe shellcheck} "$target"
|
||||
# use shellcheck which does not include docs
|
||||
# pandoc takes long to build and documentation isn't needed for in nixpkgs usage
|
||||
${lib.getExe (haskell.lib.compose.justStaticExecutables shellcheck.unwrapped)} "$target"
|
||||
runHook postCheck
|
||||
''
|
||||
else checkPhase;
|
||||
|
|
|
@ -103,7 +103,7 @@ let
|
|||
trivialBuilders = self: super:
|
||||
import ../build-support/trivial-builders.nix {
|
||||
inherit lib;
|
||||
inherit (self) runtimeShell stdenv stdenvNoCC;
|
||||
inherit (self) runtimeShell stdenv stdenvNoCC haskell;
|
||||
inherit (self.pkgsBuildHost) shellcheck;
|
||||
inherit (self.pkgsBuildHost.xorg) lndir;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue