From 21c299f077d6614176dcb12c5899cca79549dc78 Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Tue, 12 Oct 2021 12:53:02 -0700
Subject: [PATCH] writeShellApplication: get shellcheck from pkgsBuildHost

---
 pkgs/build-support/trivial-builders.nix | 4 ++--
 pkgs/top-level/stage.nix                | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index e0571632e760..707c5da0931f 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -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}
       '';
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 7db79276d899..af1ae7871e57 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -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;
     };