Skip to content

Commit 81b29ec

Browse files
authored
alexandria: use cargoRoot instead of sourceRoot to avoid hacks (#407107)
2 parents 406a695 + eca6493 commit 81b29ec

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

pkgs/by-name/al/alexandria/package.nix

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,14 @@ rustPlatform.buildRustPackage rec {
2727
fetchSubmodules = true;
2828
};
2929

30-
prePatch = ''
31-
chmod +w .. # make sure that /build/source is writeable
32-
'';
33-
3430
npmDeps = fetchNpmDeps {
3531
inherit src;
36-
sourceRoot = "${src.name}";
3732
hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE=";
3833
};
3934

35+
cargoRoot = "src-tauri";
36+
buildAndTestSubdir = "src-tauri";
37+
4038
useFetchCargoVendor = true;
4139
cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA=";
4240

@@ -61,12 +59,6 @@ rustPlatform.buildRustPackage rec {
6159
libappindicator-gtk3
6260
];
6361

64-
npmRoot = "..";
65-
66-
sourceRoot = "${src.name}/src-tauri";
67-
68-
buildAndTestDir = ".";
69-
7062
meta = {
7163
homepage = "https://github.com/btpf/Alexandria";
7264
changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}";

0 commit comments

Comments
 (0)