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

Merge pull request #319623 from Infinidoge/fix-fetch-yarn-deps

Browse Source 
fetchYarnDeps: properly accept src argument
This commit is contained in:
Atemu 2024-06-15 21:02:02 +02:00 committed by GitHub
commit 2bea8917b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/node/fetch-yarn-deps/default.nix
View File

@ -25,7 +25,8 @@ in {
tar --strip-components=1 -xf ${yarnpkg-lockfile-tar} package/index.js
mv index.js $out/libexec/yarnpkg-lockfile.js
cp ${./.}/common.js ${./.}/index.js $out/libexec/
cp ${./common.js} $out/libexec/common.js
cp ${./index.js} $out/libexec/index.js
patchShebangs $out/libexec
makeWrapper $out/libexec/index.js $out/bin/prefetch-yarn-deps \
@ -53,7 +54,8 @@ in {
tar --strip-components=1 -xf ${yarnpkg-lockfile-tar} package/index.js
mv index.js $out/libexec/yarnpkg-lockfile.js
cp ${./.}/common.js ${./.}/fixup.js $out/libexec/
cp ${./common.js} $out/libexec/common.js
cp ${./fixup.js} $out/libexec/fixup.js
patchShebangs $out/libexec
makeWrapper $out/libexec/fixup.js $out/bin/fixup-yarn-lock
@ -97,7 +99,7 @@ in {
'';
outputHashMode = "recursive";
} // hash_ // (removeAttrs args ["src" "name" "hash" "sha256"]));
} // hash_ // (removeAttrs args (["name" "hash" "sha256"] ++ (lib.optional (src == null) "src"))));
in lib.setFunctionArgs f (lib.functionArgs f) // {
inherit tests;