on iko/ghcjs-patch-master help sign in
git-ls-files should prefer local building (#1378)
commitc084516ada97b27b51bf4c6a0637aca8cef9113d authorCheng Shao <astrohavoc@gmail.com> dateTue 22 Feb 2022, 15:24 (5 years ago) parentb263e40
1 file changed+4−4
lib/clean-git.nix+4−4
lib/clean-git.nix+4−4
@@ -1,5 +1,5 @@
11# From https://github.com/NixOS/nix/issues/2944
2−{ lib, runCommand, git, cleanSourceWith }:
2+{ lib, runCommandLocal, git, cleanSourceWith }:
33{ name ? null, src, subDir ? "", includeSiblings ? false, keepGitDir ? false }:
44
55# The function call
@@ -112,7 +112,7 @@ then
112112 # `git ls-files --recurse-submodules` to give us an accurate list
113113 # of all the files in the index.
114114 whitelist_files = knownSubmoduleDirs:
115− runCommand "git-ls-files" {} ''
115+ runCommandLocal "git-ls-files" {} ''
116116 tmp=$(mktemp -d)
117117 cd $tmp
118118 ${ lib.optionalString hasSubmodules ''
@@ -135,7 +135,7 @@ then
135135 ${git}/bin/git ls-files --recurse-submodules > $out/files
136136 '';
137137
138− # Find the submodules
138+ # Find the submodules
139139 whitelist_recursive = knownSubmoduleDirs:
140140 let
141141 # Get the new list of submoduleDirs and files
@@ -176,7 +176,7 @@ then
176176 );
177177
178178 # Identify files in the `.git` dir
179− isGitDirPath = path:
179+ isGitDirPath = path:
180180 path == origSrcSubDir + "/.git"
181181 || lib.hasPrefix (origSrcSubDir + "/.git/") path;
182182