From 52591a80f426c9253533dca59c1f60a5580180f7 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 14 May 2025 22:18:18 +0200 Subject: [PATCH] pot: use cargoRoot instead of sourceRoot to avoid hack --- pkgs/by-name/po/pot/package.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index bf23b4401ef9..10098cccb472 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -34,8 +34,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-0Q1hf1AGAZv6jt05tV3F6++lzLpddvjhiykIhV40cPs="; }; - sourceRoot = "${finalAttrs.src.name}/src-tauri"; - postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -46,11 +44,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-iYQNGRWqXYBU+WIH/Xm8qndgOQ6RKYCtAyi93kb7xrQ="; }; - pnpmRoot = ".."; + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; - sourceRoot = "${finalAttrs.src.name}/src-tauri"; + inherit (finalAttrs) + pname + version + src + cargoRoot + ; hash = "sha256-dyXINRttgsqCfmgtZNXxr/Rl8Yn0F2AVm8v2Ao+OBsw="; }; @@ -93,12 +96,6 @@ stdenv.mkDerivation (finalAttrs: { } )}"; - preConfigure = '' - # pnpm.configHook has to write to .., as our sourceRoot is set to src-tauri - # TODO: move frontend into its own drv - chmod +w .. - ''; - meta = { description = "Cross-platform translation software"; mainProgram = "pot";