Unverified Commit e66223d4 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #269885 from Stunkymonkey/tilt-migrate-prefetch-yarn-deps 

tilt: migrate to prefetch-yarn-deps
parents 9853bcdf 25f1b1f4

pkgs/applications/networking/cluster/tilt/assets.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
, stdenvNoCC

, version, src

, fetchYarnDeps

, fixup_yarn_lock, yarn, nodejs

, prefetch-yarn-deps, yarn, nodejs

}:



stdenvNoCC.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec { 


  inherit src version;



  nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ];

  nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ];



  yarnOfflineCache = fetchYarnDeps {

    yarnLock = "${src}/web/yarn.lock";
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec { 
    yarn config --offline set yarn-offline-mirror $yarnOfflineCache



    cd web

    fixup_yarn_lock yarn.lock

    fixup-yarn-lock yarn.lock

    yarn install --offline --frozen-lockfile --ignore-engines

    patchShebangs node_modules

    export PATH=$PWD/node_modules/.bin:$PATH