From cf6f772676b4f3cc7bcd04eb75dadcea85c2cb01 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Wed, 6 Oct 2021 18:26:50 +0200
Subject: [PATCH] mkYarnModules: allow passing custom offlineCache
---
.../development/tools/yarn2nix-moretea/yarn2nix/default.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
index cba0227fd1fa..8097f2b364c2 100644
--- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
+++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix
@@ -68,6 +68,7 @@ in rec {
packageJSON,
yarnLock,
yarnNix ? mkYarnNix { inherit yarnLock; },
+ offlineCache ? importOfflineCache yarnNix,
yarnFlags ? defaultYarnFlags,
pkgConfig ? {},
preBuild ? "",
@@ -75,8 +76,6 @@ in rec {
workspaceDependencies ? [], # List of yarn packages
}:
let
- offlineCache = importOfflineCache yarnNix;
-
extraBuildInputs = (lib.flatten (builtins.map (key:
pkgConfig.${key}.buildInputs or []
) (builtins.attrNames pkgConfig)));
@@ -227,6 +226,7 @@ in rec {
packageJSON ? src + "/package.json",
yarnLock ? src + "/yarn.lock",
yarnNix ? mkYarnNix { inherit yarnLock; },
+ offlineCache ? importOfflineCache yarnNix,
yarnFlags ? defaultYarnFlags,
yarnPreBuild ? "",
yarnPostBuild ? "",
@@ -253,7 +253,7 @@ in rec {
preBuild = yarnPreBuild;
postBuild = yarnPostBuild;
workspaceDependencies = workspaceDependenciesTransitive;
- inherit packageJSON pname version yarnLock yarnNix yarnFlags pkgConfig;
+ inherit packageJSON pname version yarnLock offlineCache yarnFlags pkgConfig;
};
publishBinsFor_ = unlessNull publishBinsFor [pname];