From eca64935f24bdeac849dc6acc10310376ebb5a70 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 14 May 2025 20:39:58 +0200 Subject: [PATCH] alexandria: use cargoRoot instead of sourceRoot to avoid hacks --- pkgs/by-name/al/alexandria/package.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix index a97efd139000..345f66c6470a 100644 --- a/pkgs/by-name/al/alexandria/package.nix +++ b/pkgs/by-name/al/alexandria/package.nix @@ -27,16 +27,14 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - prePatch = '' - chmod +w .. # make sure that /build/source is writeable - ''; - npmDeps = fetchNpmDeps { inherit src; - sourceRoot = "${src.name}"; hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE="; }; + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; + useFetchCargoVendor = true; cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA="; @@ -61,12 +59,6 @@ rustPlatform.buildRustPackage rec { libappindicator-gtk3 ]; - npmRoot = ".."; - - sourceRoot = "${src.name}/src-tauri"; - - buildAndTestDir = "."; - meta = { homepage = "https://github.com/btpf/Alexandria"; changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}";