Unverified Commit 7f7d0088 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

clash-verge-rev: 2.1.2 -> 2.2.2 (#391733)

parents 12ab22da d6ff4388

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

+7 −7
Original line number Diff line number Diff line
@@ -14,25 +14,25 @@ 
}:

let

  pname = "clash-verge-rev";

  version = "2.1.2";

  version = "2.2.2";



  src = fetchFromGitHub {

    owner = "clash-verge-rev";

    repo = "clash-verge-rev";

    tag = "v${version}";

    hash = "sha256-rsl3hBywToemthNrG80Mv+JagA4g4S7HukOaRpMKJi8=";

    hash = "sha256-CiVwFSCbCxFm8naogpL73gUp8HNHwcIiygSVon4WNZk=";

  };



  src-service = fetchFromGitHub {

    owner = "clash-verge-rev";

    repo = "clash-verge-service";

    rev = "bfd7d597b13d49cf49b64676c2719f1ed9599d22"; # no meaningful tags in this repo. The only way is updating manully every time.

    hash = "sha256-LdM0VIVsDPGnHEGwbRFh4/ACTdpVyDnu6dYLLvVbwpc=";

    rev = "ffcccc6095e052534980230f9e0ca97db2675062"; # no meaningful tags in this repo. The only way is updating manully every time.

    hash = "sha256-AbUflPcuSuUigRQB0i52mfVu5sIep1vMZGVMZyznwXY=";

  };



  service-cargo-hash = "sha256-mJEk4OAEcuTk5NCzPcWwSlvysqR/9s8p9OGiXWBZvdg=";

  npm-hash = "sha256-1OT9Iv9AF4svaOnWNQfOUdo8EUkG0+PU+y8nprc6YjU=";

  vendor-hash = "sha256-myvFXaS+QdBRHPpcLEmhg1wgheWb4uXv+QXQf5HA51M=";

  service-cargo-hash = "sha256-lMOQznPlkHIMSm5nOLuGP9qJXt3CXnd+q8nCu+Xbbt8=";

  npm-hash = "sha256-v9+1NjXo/1ogmep+4IP+9qoUR1GJz87VGeOoMzQ1Rfw=";

  vendor-hash = "sha256-nU3bIxD5zggTScNGH3HmnnXUGkLMwnQbIBVI1DmIpFs=";



  service = callPackage ./service.nix {

    inherit

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

+14 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
  src,

  libayatana-appindicator,

  vendor-hash,

  fetchpatch,

  glib,

  webui,

  pkg-config,
@@ -29,7 +30,20 @@ rustPlatform.buildRustPackage { 
    OPENSSL_NO_VENDOR = 1;

  };



  patches = [

    (fetchpatch {

      name = "fix-service-mode-mihomo-check.patch";

      url = "https://github.com/clash-verge-rev/clash-verge-rev/commit/16d4f9fe7ee95b7312a10bf216c818c3e144dea7.patch";

      hash = "sha256-FQHm1jjo0W1IokMDJGWVMVV9DWItG1prX+TIysL12DA=";

    })

  ];



  prePatch = ''

    cd ..

  '';



  postPatch = ''

    cd src-tauri

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

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