colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

writeShellApplication: get shellcheck from pkgsBuildHost

Browse Source
This commit is contained in:
Bernardo Meurer 2021-10-12 12:53:02 -07:00
parent 0e4f04b74c
commit 21c299f077
No known key found for this signature in database
GPG Key ID: F4C0D53B8D14C246
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/trivial-builders.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, makeBinPath, shellcheck }:
{ lib, stdenv, stdenvNoCC, lndir, runtimeShell, shellcheck }:
rec {
@ -282,7 +282,7 @@ rec {
set -o nounset
set- o pipefail
export PATH="${makeBinPath runtimeInputs}:$PATH"
export PATH="${lib.makeBinPath runtimeInputs}:$PATH"
${text}
'';

4
pkgs/top-level/stage.nix
View File

@ -76,7 +76,9 @@ let
trivialBuilders = self: super:
import ../build-support/trivial-builders.nix {
inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.pkgsBuildHost.xorg) lndir;
inherit lib; inherit (self) stdenv stdenvNoCC;
inherit (self.pkgsBuildHost) shellcheck;
inherit (self.pkgsBuildHost.xorg) lndir;
inherit (self) runtimeShell;
};