Commit f20cf1dd authored by HHR2020's avatar HHR2020
Browse files

clash-verge-rev: 2.3.2 -> 2.4.0 

Fix verge-mihomo.sock socket path for the new version.

Changelog: https://github.com/clash-verge-rev/clash-verge-rev/releases/tag/v2.4.0
parent e098b1d0

pkgs/by-name/cl/clash-verge-rev/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 
}:

let

  pname = "clash-verge-rev";

  version = "2.3.2";

  version = "2.4.0";



  src = fetchFromGitHub {

    owner = "clash-verge-rev";

    repo = "clash-verge-rev";

    tag = "v${version}";

    hash = "sha256-Wdd1iZspVcCxifCYvST4vlatQJXnyeZkm3Ifc8Q2xtM=";

    hash = "sha256-Kw2QXePBjDs0kUMPLE7UyN/v9GvsMNYi1rxcy+O6EWs=";

  };



  src-service = fetchFromGitHub {
@@ -29,8 +29,8 @@ let 
  };



  service-cargo-hash = "sha256-HET7/Lyc0Ip1f9WMVzUWr0QFuL8YN3dgZdK0adl/rYc=";

  pnpm-hash = "sha256-yizUju+AswVkbfPMxNhHkrkKsFIe7yedEUqS15uy+V0=";

  vendor-hash = "sha256-u2y0fSx15Kbe3auL7c4enW0y6z4gjvTg4WIGkmXpMmI=";

  pnpm-hash = "sha256-O6JO5sW3eKjOPcnu2JDnXEUnR2Yma+SkRMOfEjG5X/E=";

  vendor-hash = "sha256-kUPzKfrcMaGAMGzYy666I9l3ctac7b1xTCO8oMA9fYg=";



  service = callPackage ./service.nix {

    inherit

pkgs/by-name/cl/clash-verge-rev/unwrapped.nix

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ rustPlatform.buildRustPackage { 
    # See service.nix for reasons

    substituteInPlace src-tauri/src/core/service_ipc.rs \

      --replace-fail "/tmp/clash-verge-service.sock" "/run/clash-verge-rev/service.sock"

    # Set verge-mihomo.sock path

    # In service mode, use /run/clash-verge-rev

    # In sidecar mode, use $XDG_RUNTIME_DIR or /run/user/$UID or /tmp

    substituteInPlace src-tauri/src/utils/dirs.rs \

      --replace-fail '"/var/tmp", "/tmp"' '"/run/clash-verge-rev", &std::env::var("XDG_RUNTIME_DIR").unwrap_or_else(|_| std::env::var("UID").map(|uid| format!("/run/user/{}", uid)).unwrap_or_else(|_| "/tmp".to_string()))' \

      --replace-fail 'base_dir.join("verge")' 'base_dir'



    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \

      --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"