From 3058834efa3fe8510cf77b4c256094f94f2fb47a Mon Sep 17 00:00:00 2001 From: Yureka Date: Wed, 5 Mar 2025 14:33:29 +0100 Subject: [PATCH] ratman.dashboard: use yarnConfigHook --- pkgs/by-name/ra/ratman/package.nix | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix index af18458d95f6..00561582016d 100644 --- a/pkgs/by-name/ra/ratman/package.nix +++ b/pkgs/by-name/ra/ratman/package.nix @@ -7,9 +7,9 @@ protobuf, rustPlatform, fetchYarnDeps, - fixup-yarn-lock, + yarnConfigHook, + yarnBuildHook, stdenv, - yarn, nodejs_20, }: @@ -54,15 +54,15 @@ rustPlatform.buildRustPackage rec { inherit version src; sourceRoot = "${src.name}/ratman/dashboard"; - yarnDeps = fetchYarnDeps { + yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/ratman/dashboard/yarn.lock"; sha256 = "sha256-pWjKL41r/bTvWv+5qCgCFVL9+o64BiV2/ISdLeKEOqE="; }; nativeBuildInputs = [ - yarn nodejs_20 - fixup-yarn-lock + yarnConfigHook + yarnBuildHook ]; outputs = [ @@ -70,24 +70,6 @@ rustPlatform.buildRustPackage rec { "dist" ]; - buildPhase = '' - # Yarn writes temporary files to $HOME. Copied from mkYarnModules. - export HOME=$NIX_BUILD_TOP/yarn_home - - # Make yarn install packages from our offline cache, not the registry - yarn config --offline set yarn-offline-mirror ${yarnDeps} - - # Fixup "resolved"-entries in yarn.lock to match our offline cache - fixup-yarn-lock yarn.lock - - yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive - - patchShebangs node_modules/ - - # Build into `./dist/`, suppress formatting. - yarn --offline build | cat - ''; - installPhase = '' cp -R . $out