Unverified Commit 81b29eca authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

alexandria: use cargoRoot instead of sourceRoot to avoid hacks (#407107)

parents 406a695e eca64935
Loading
Loading
Loading
Loading
+3 −11
Original line number Diff line number Diff line
@@ -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}";