Unverified Commit db6255c1 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #220030 from Artturin/write-shell-application-lighter

parents 731186df b1e6e553

pkgs/build-support/trivial-builders.nix

+4 −2
Original line number Diff line number Diff line 
{ 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;

pkgs/top-level/stage.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

    };