Unverified Commit 02266dc6 authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

electron: migrate to fixup-yarn-lock from prefetch-yarn-deps (#269933)

parent 42e8dd45

pkgs/development/tools/electron/common.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
, python3

, fetchYarnDeps

, fetchNpmDeps

, fixup_yarn_lock

, prefetch-yarn-deps

, npmHooks

, yarn

, substituteAll
@@ -27,7 +27,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { 
  inherit (info) version;

  buildTargets = [ "electron:electron_dist_zip" ];



  nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn fixup_yarn_lock unzip npmHooks.npmConfigHook ];

  nativeBuildInputs = base.nativeBuildInputs ++ [ nodejs yarn prefetch-yarn-deps unzip npmHooks.npmConfigHook ];

  buildInputs = base.buildInputs ++ [ libnotify ];



  electronOfflineCache = fetchYarnDeps {
@@ -107,7 +107,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: { 
      cd electron

      export HOME=$TMPDIR/fake_home

      yarn config --offline set yarn-offline-mirror $electronOfflineCache

      fixup_yarn_lock yarn.lock

      fixup-yarn-lock yarn.lock

      yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive

    )