@@ -1,5 +1,5 @@
1# From https://github.com/NixOS/nix/issues/2944
1# From https://github.com/NixOS/nix/issues/2944
2−{ lib, runCommand, git, cleanSourceWith }:
2+{ lib, runCommandLocal, git, cleanSourceWith }:
3{ name ? null, src, subDir ? "", includeSiblings ? false, keepGitDir ? false }:
3{ name ? null, src, subDir ? "", includeSiblings ? false, keepGitDir ? false }:
5# The function call
5# The function call
@@ -112,7 +112,7 @@ then
112 # `git ls-files --recurse-submodules` to give us an accurate list
112 # `git ls-files --recurse-submodules` to give us an accurate list
113 # of all the files in the index.
113 # of all the files in the index.
114 whitelist_files = knownSubmoduleDirs:
114 whitelist_files = knownSubmoduleDirs:
115− runCommand "git-ls-files" {} ''
115+ runCommandLocal "git-ls-files" {} ''
116 tmp=$(mktemp -d)
116 tmp=$(mktemp -d)
118 ${ lib.optionalString hasSubmodules ''
118 ${ lib.optionalString hasSubmodules ''
@@ -135,7 +135,7 @@ then
135 ${git}/bin/git ls-files --recurse-submodules > $out/files
135 ${git}/bin/git ls-files --recurse-submodules > $out/files
138− # Find the submodules
138+ # Find the submodules
139 whitelist_recursive = knownSubmoduleDirs:
139 whitelist_recursive = knownSubmoduleDirs:
141 # Get the new list of submoduleDirs and files
141 # Get the new list of submoduleDirs and files
@@ -176,7 +176,7 @@ then
178 # Identify files in the `.git` dir
178 # Identify files in the `.git` dir
179− isGitDirPath = path:
179+ isGitDirPath = path:
180 path == origSrcSubDir + "/.git"
180 path == origSrcSubDir + "/.git"
181 || lib.hasPrefix (origSrcSubDir + "/.git/") path;
181 || lib.hasPrefix (origSrcSubDir + "/.git/") path;