Skip to content

Commit 600f03d

Browse files
flclash: 0.8.70 -> 0.8.76 (#382400)
2 parents 700cc1b + af9e6a7 commit 600f03d

File tree

3 files changed

+126
-111
lines changed

3 files changed

+126
-111
lines changed

pkgs/by-name/fl/flclash/package.nix

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,47 @@
11
{
22
lib,
33
fetchFromGitHub,
4-
flutter324,
4+
flutter327,
55
keybinder3,
66
libayatana-appindicator,
77
buildGoModule,
88
makeDesktopItem,
99
copyDesktopItems,
10-
wrapGAppsHook3,
1110
autoPatchelfHook,
1211
}:
12+
1313
let
1414
pname = "flclash";
15-
version = "0.8.70";
15+
version = "0.8.76";
16+
1617
src =
1718
(fetchFromGitHub {
1819
owner = "chen08209";
1920
repo = "FlClash";
2021
tag = "v${version}";
21-
hash = "sha256-6gDkRqbAGqwF+HCThWAHK0Jh/dxaYlnaYaAiXN48z5E=";
22+
hash = "sha256-LNHaleqh3eAQcfYSz7xIaWeNUtmlFXOyG2S7zz2+XeI=";
2223
fetchSubmodules = true;
2324
}).overrideAttrs
2425
(_: {
2526
GIT_CONFIG_COUNT = 1;
2627
GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
2728
GIT_CONFIG_VALUE_0 = "[email protected]:";
2829
});
30+
31+
metaCommon = {
32+
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
33+
homepage = "https://github.com/chen08209/FlClash";
34+
license = with lib.licenses; [ gpl3Plus ];
35+
maintainers = with lib.maintainers; [ ];
36+
};
37+
2938
libclash = buildGoModule {
30-
inherit pname version src;
39+
inherit version src;
40+
pname = "libclash";
3141

32-
modRoot = "./core";
42+
modRoot = "core";
3343

34-
vendorHash = "sha256-yam3DgY/dfwIRc7OvFltwX29x6xGlrrsK4Oj6oaGYRw=";
44+
vendorHash = "sha256-p6GE97n5/ZCIjgmfL//2doRW/PGpUtjeKxhRs/aveus=";
3545

3646
env.CGO_ENABLED = 0;
3747

@@ -44,22 +54,16 @@ let
4454
runHook postBuild
4555
'';
4656

47-
meta = {
48-
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
49-
homepage = "https://github.com/chen08209/FlClash";
50-
license = with lib.licenses; [ gpl3Plus ];
51-
maintainers = with lib.maintainers; [ ];
52-
};
57+
meta = metaCommon;
5358
};
5459
in
55-
flutter324.buildFlutterApplication {
60+
flutter327.buildFlutterApplication {
5661
inherit pname version src;
5762

5863
pubspecLock = lib.importJSON ./pubspec.lock.json;
5964

6065
nativeBuildInputs = [
6166
copyDesktopItems
62-
wrapGAppsHook3
6367
autoPatchelfHook
6468
];
6569

@@ -88,20 +92,21 @@ flutter324.buildFlutterApplication {
8892
];
8993

9094
preBuild = ''
91-
mkdir -p ./libclash/linux/
92-
cp ${libclash}/bin/FlClashCore ./libclash/linux/FlClashCore
95+
mkdir -p libclash/linux
96+
cp ${libclash}/bin/FlClashCore libclash/linux/FlClashCore
9397
'';
9498

9599
postInstall = ''
96-
install -Dm644 ./assets/images/icon.png $out/share/pixmaps/flclash.png
100+
install -Dm644 assets/images/icon.png $out/share/pixmaps/flclash.png
97101
'';
98102

99-
meta = {
100-
description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
101-
homepage = "https://github.com/chen08209/FlClash";
103+
passthru = {
104+
inherit libclash;
105+
updateScript = ./update.sh;
106+
};
107+
108+
meta = metaCommon // {
102109
mainProgram = "FlClash";
103-
license = with lib.licenses; [ gpl3Plus ];
104-
maintainers = with lib.maintainers; [ ];
105110
platforms = lib.platforms.linux;
106111
};
107112
}

0 commit comments

Comments
 (0)