Unverified Commit 09d89d21 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

pot: use cargoRoot instead of sourceRoot to avoid hack (#407155)

parents 889b4dcb 52591a80

pkgs/by-name/po/pot/package.nix

+8 −11
Original line number Diff line number Diff line
@@ -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";