From e89fc9caf5e7acd48e1a4663a7860a4ebc2e30c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 18 Oct 2024 17:17:32 +0200 Subject: [PATCH] bitwarden-desktop: further simplify checkPhase --- pkgs/by-name/bi/bitwarden-desktop/package.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index bd023bcb76c8..ce31c0fdd96c 100644 --- a/pkgs/by-name/bi/bitwarden-desktop/package.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -127,7 +127,7 @@ in buildNpmPackage rec { postBuild = '' pushd apps/desktop - # desktop_native/index.js loads a file of that name regarldess of the libc being used + # desktop_native/index.js loads a file of that name regardless of the libc being used mv desktop_native/napi/desktop_napi.* desktop_native/napi/desktop_napi.linux-${bitwardenDesktopNativeArch}-musl.node npm exec electron-builder -- \ @@ -148,17 +148,14 @@ in buildNpmPackage rec { "--skip=password::password::tests::test" ]; - checkPhase = '' - runHook preCheck + preCheck = '' + pushd ${cargoRoot} + cargoCheckType=release + HOME=$(mktemp -d) + ''; - ( - cd ${cargoRoot} - HOME=$(mktemp -d) - cargoCheckType=release - cargoCheckHook - ) - - runHook postCheck + postCheck = '' + popd ''; installPhase = ''