quixos/yarn-plugin-nixify-patched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect paths in generated expression

Browse Source
This commit is contained in:
Stéphan Kochen
2022-11-09 13:22:02 +01:00
parent 8573cfb070
commit a357ca5b7f
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/generate.ts
+2 -7
View File
@@ -81,11 +81,6 @@ export default async (
// Determine relative paths for Nix path literals. // Determine relative paths for Nix path literals.
const nixExprPath = configuration.get(`nixExprPath`); const nixExprPath = configuration.get(`nixExprPath`);
const lockfileFilename = configuration.get(`lockfileFilename`); const lockfileFilename = configuration.get(`lockfileFilename`);
const lockfileRel = ppath.relative(
ppath.dirname(nixExprPath),
lockfileFilename
);
const yarnPathRel = ppath.relative(ppath.dirname(nixExprPath), yarnPath);
// Build a list of cache entries so Nix can fetch them. // Build a list of cache entries so Nix can fetch them.
// TODO: See if we can use Nix fetchurl for npm: dependencies. // TODO: See if we can use Nix fetchurl for npm: dependencies.
@@ -281,8 +276,8 @@ export default async (
const projectName = ident ? structUtils.stringifyIdent(ident) : `workspace`; const projectName = ident ? structUtils.stringifyIdent(ident) : `workspace`;
const projectExpr = renderTmpl(projectExprTmpl, { const projectExpr = renderTmpl(projectExprTmpl, {
PROJECT_NAME: json(projectName), PROJECT_NAME: json(projectName),
YARN_PATH: yarnPathRel, YARN_PATH: yarnPath,
LOCKFILE: lockfileRel, LOCKFILE: lockfileFilename,
CACHE_FOLDER: json(cacheFolder), CACHE_FOLDER: json(cacheFolder),
CACHE_ENTRIES: cacheEntriesCode, CACHE_ENTRIES: cacheEntriesCode,
ISOLATED: isolatedCode.join("\n"), ISOLATED: isolatedCode.join("\n"),