From 835e1109154c41ea4356014fbaf849250192124b Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 26 Sep 2022 17:12:03 +0200 Subject: [PATCH] gitlab.assets: pass yarnOfflineCache as environment variable --- .../version-management/gitlab/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index aee4ee3df1b6..47ca0f4f48d3 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -50,15 +50,15 @@ let extraConfigPaths = lib.forEach data.vendored_gems (gem: "${src}/vendor/gems/${gem}"); }; - yarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = data.yarn_hash; - }; - assets = stdenv.mkDerivation { pname = "gitlab-assets"; inherit version src; + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = data.yarn_hash; + }; + nativeBuildInputs = [ rubyEnv.wrappedRuby rubyEnv.bundler nodejs yarn git cacert ]; patches = [ @@ -91,7 +91,7 @@ let export HOME=$NIX_BUILD_TOP/fake_home # Make yarn install packages from our offline cache, not the registry - yarn config --offline set yarn-offline-mirror ${yarnOfflineCache} + yarn config --offline set yarn-offline-mirror $yarnOfflineCache # Fixup "resolved"-entries in yarn.lock to match our offline cache ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock