apps/EasyTier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2025-09-27 04:56:07 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

chore: update flake configuration (#1163)

Browse Source
This commit is contained in:
Mg Pig
2025-07-29 00:26:05 +08:00
committed by GitHub
parent e70eed74e2
commit 5514de1187
5 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -12,6 +12,7 @@ target-*/
.vscode .vscode
/.idea /.idea
/.direnv/
# perf & flamegraph # perf & flamegraph
perf.data perf.data

2
CONTRIBUTING.md
View File

@@ -37,7 +37,6 @@ Thank you for your interest in contributing to EasyTier! This document provides
# Core build dependencies # Core build dependencies
sudo apt-get update && sudo apt-get install -y \ sudo apt-get update && sudo apt-get install -y \
musl-tools \ musl-tools \
libappindicator3-dev \
llvm \ llvm \
clang \ clang \
protobuf-compiler protobuf-compiler
@@ -53,6 +52,7 @@ sudo apt install -y \
librsvg2-dev \ librsvg2-dev \
libxdo-dev \ libxdo-dev \
libssl-dev \ libssl-dev \
libappindicator3-dev \
patchelf patchelf
# Testing dependencies # Testing dependencies

2
CONTRIBUTING_zh.md
View File

@@ -45,7 +45,6 @@
# 核心构建依赖 # 核心构建依赖
sudo apt-get update && sudo apt-get install -y \ sudo apt-get update && sudo apt-get install -y \
musl-tools \ musl-tools \
libappindicator3-dev \
llvm \ llvm \
clang \ clang \
protobuf-compiler protobuf-compiler
@@ -61,6 +60,7 @@ sudo apt install -y \
librsvg2-dev \ librsvg2-dev \
libxdo-dev \ libxdo-dev \
libssl-dev \ libssl-dev \
libappindicator3-dev \
patchelf patchelf
# 测试依赖 # 测试依赖

12
flake.lock generated
View File

@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750741721, "lastModified": 1753429684,
"narHash": "sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE=", "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4b1164c3215f018c4442463a27689d973cffd750", "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750905536, "lastModified": 1753671061,
"narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", "narHash": "sha256-IU4eBWfe9h2QejJYST+EAlhg8a1H6mh9gbcmWgZ2/mQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", "rev": "40065d17ee4dbec3ded8ca61236132aede843fab",
"type": "github" "type": "github"
}, },
"original": { "original": {

31
flake.nix
View File

@@ -10,35 +10,48 @@
}; };
}; };
outputs = { self, nixpkgs, flake-utils, rust-overlay }: outputs = { self, nixpkgs, flake-utils, rust-overlay, ... }:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
overlays = [ (import rust-overlay) ]; overlays = [ (import rust-overlay) ];
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system overlays; inherit system overlays;
}; };
rustVersion = "1.87.0";
lib = nixpkgs.lib; rust = pkgs.rust-bin.stable.${rustVersion}.default.override{
rust = pkgs.rust-bin.stable.latest.default.override {
extensions = [ "rust-src" "rust-analyzer" ]; extensions = [ "rust-src" "rust-analyzer" ];
}; };
in in
{ {
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell rec {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
rust rust
pkg-config
protobuf protobuf
]; clang
pkg-config
# web
nodejs_22
pnpm
];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
zstd zstd
openssl
libclang
llvmPackages.libclang
# gui
webkitgtk_4_1
libsoup_3
]; ];
RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib"; LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.clang}/resource-root/include";
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (buildInputs ++ nativeBuildInputs);
ZSTD_SYS_USE_PKG_CONFIG = true; ZSTD_SYS_USE_PKG_CONFIG = true;
KCP_SYS_EXTRA_HEADER_PATH = "${pkgs.libclang.lib}/lib/clang/19/include:${pkgs.glibc.dev}/include"; KCP_SYS_EXTRA_HEADER_PATH = "${pkgs.libclang.lib}/lib/clang/19/include:${pkgs.glibc.dev}/include";
}; };
}); }
);
} }