From b976e947e1804cb669574a20393cede8ee95c2e1 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Wed, 17 May 2023 16:26:18 +0800 Subject: [PATCH 1/3] clash-verge: remove unpackPhase --- pkgs/applications/networking/clash-verge/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/clash-verge/default.nix b/pkgs/applications/networking/clash-verge/default.nix index 84bdefc5f683..8aed4a068e92 100644 --- a/pkgs/applications/networking/clash-verge/default.nix +++ b/pkgs/applications/networking/clash-verge/default.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { hash = "sha256-AEOFMKxrkPditf5ks++tII6zeuH72Fxw/TVtZeXS3v4="; }; - unpackPhase = "dpkg-deb -x $src ."; - nativeBuildInputs = [ dpkg wrapGAppsHook From a709181137c3a88a078ccc7fff204b18e4cbf7e5 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Wed, 17 May 2023 17:02:12 +0800 Subject: [PATCH 2/3] clash-verge: use clash and clash-meta from nixpkgs --- pkgs/applications/networking/clash-verge/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/networking/clash-verge/default.nix b/pkgs/applications/networking/clash-verge/default.nix index 8aed4a068e92..435633e3ddd8 100644 --- a/pkgs/applications/networking/clash-verge/default.nix +++ b/pkgs/applications/networking/clash-verge/default.nix @@ -4,6 +4,8 @@ , dpkg , wrapGAppsHook , autoPatchelfHook +, clash +, clash-meta , openssl , webkitgtk , udev @@ -41,10 +43,16 @@ stdenv.mkDerivation rec { mkdir -p $out/bin mv usr/* $out + rm $out/bin/{clash,clash-meta} runHook postInstall ''; + postFixup = '' + ln -s ${lib.getExe clash} $out/bin/clash + ln -s ${lib.getExe clash-meta} $out/bin/clash-meta + ''; + meta = with lib; { description = "A Clash GUI based on tauri"; homepage = "https://github.com/zzzgydi/clash-verge"; From b9ed6e1919bddb94f543c843c08b297849008fe4 Mon Sep 17 00:00:00 2001 From: SamLukeYes Date: Sat, 20 May 2023 11:40:17 +0800 Subject: [PATCH 3/3] clash-verge: 1.3.1 -> 1.3.2 --- pkgs/applications/networking/clash-verge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/clash-verge/default.nix b/pkgs/applications/networking/clash-verge/default.nix index 435633e3ddd8..2ebc2c095b70 100644 --- a/pkgs/applications/networking/clash-verge/default.nix +++ b/pkgs/applications/networking/clash-verge/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "clash-verge"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-AEOFMKxrkPditf5ks++tII6zeuH72Fxw/TVtZeXS3v4="; + hash = "sha256-46+7P9WH85fC3m+5LQHpvZX2ggeH6djoO53fQxQJdYk="; }; nativeBuildInputs = [