sing-geoip: use dbip-country-lite instead of unfree clash-geoip

This commit is contained in:
Nick Cao
2023-06-03 23:11:04 +08:00
parent 8b00d7f098
commit 3c7688a814
2 changed files with 8 additions and 6 deletions
+5 -5
View File
@@ -2,7 +2,7 @@
, stdenvNoCC
, buildGoModule
, fetchFromGitHub
, clash-geoip
, dbip-country-lite
}:
let
@@ -34,7 +34,7 @@ let
in
stdenvNoCC.mkDerivation rec {
inherit (generator) pname;
inherit (clash-geoip) version;
inherit (dbip-country-lite) version;
dontUnpack = true;
@@ -43,8 +43,8 @@ stdenvNoCC.mkDerivation rec {
buildPhase = ''
runHook preBuild
${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip.db
${pname} ${clash-geoip}/etc/clash/Country.mmdb geoip-cn.db cn
${pname} ${dbip-country-lite.mmdb} geoip.db
${pname} ${dbip-country-lite.mmdb} geoip-cn.db cn
runHook postBuild
'';
@@ -61,6 +61,6 @@ stdenvNoCC.mkDerivation rec {
passthru = { inherit generator; };
meta = generator.meta // {
inherit (clash-geoip.meta) license;
inherit (dbip-country-lite.meta) license;
};
}
+3 -1
View File
@@ -12442,7 +12442,9 @@ with pkgs;
sing-geosite = callPackage ../data/misc/sing-geosite { };
sing-geoip = callPackage ../data/misc/sing-geoip { };
sing-geoip = callPackage ../data/misc/sing-geoip {
buildGoModule = buildGo119Module;
};
sipcalc = callPackage ../tools/networking/sipcalc { };