NixOS/chuang-packages
1
0
Fork 0
Code Releases Activity

更新目录结构，用厂商区分一下包

Browse Source
This commit is contained in:
Sense T 2025-03-01 09:47:34 +08:00
parent 75a466fbd2
commit 1cc5ff724f
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -52,7 +52,7 @@
}; };
packages."${system}" = { packages."${system}" = {
h3c-inode-client = pkgs.callPackage ./h3c-inode-client/package.nix { }; h3c = import ./h3c { inherit pkgs; };
}; };
nixosModules = nixosModules =
@ -64,7 +64,7 @@
{ config, lib, ... }: { config, lib, ... }:
{ {
imports = [ imports = [
(import ./h3c-inode-client/module.nix { inherit lib pkgs-chuang config; }) (import ./h3c/inode-client/module.nix { inherit lib pkgs-chuang config; })
]; ];
}; };

5
h3c/default.nix Normal file
View File

@ -0,0 +1,5 @@
{ pkgs, ... }:
{
# 导入安装包
inode-client = pkgs.callPackage ./inode-client/package.nix { };
}

16
h3c-inode-client/module.nix → h3c/inode-client/module.nix
View File

@ -10,7 +10,13 @@ in
{ {
options.services.h3c-inode-client = { options.services.h3c-inode-client = {
enable = lib.mkEnableOption "H3C iNodeClient - ssl vpn client."; enable = lib.mkEnableOption "H3C iNodeClient - ssl vpn client.";
package = lib.mkPackageOption pkgs-chuang "h3c-inode-client" { }; package = lib.mkPackageOption pkgs-chuang "h3c.inode-client" {
pkgsText = "pkgs-chuang";
default = [
"h3c"
"inode-client"
];
};
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -18,10 +24,10 @@ in
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
systemd.services.h3c-inode-client = { systemd.services.h3c-inode-client = {
wantedBy = [ #wantedBy = [
"network-online.target" # "network-online.target"
"graphical.target" # "graphical.target"
]; #];
after = [ "network-online.target" ]; after = [ "network-online.target" ];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";

8
h3c-inode-client/package.nix → h3c/inode-client/package.nix
View File

@ -53,8 +53,8 @@ let
xorg.libXxf86vm xorg.libXxf86vm
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
pname = "h3c-inode-client"; pname = "inode-client";
version = "7.3.0"; version = "7.3.0";
src = fetchTarball { src = fetchTarball {
@ -113,11 +113,11 @@ stdenv.mkDerivation {
# 运行文件 # 运行文件
mkdir -p $out/bin mkdir -p $out/bin
cat > $out/bin/h3c-inode-client <<EOF cat > $out/bin/${pname} <<EOF
#!/usr/bin/env bash #!/usr/bin/env bash
$out${install_dir}/.iNode/iNodeClient $out${install_dir}/.iNode/iNodeClient
EOF EOF
chmod +x $out/bin/h3c-inode-client chmod +x $out/bin/${pname}
cat > $out/bin/setup <<EOF cat > $out/bin/setup <<EOF
#!/usr/bin/env bash #!/usr/bin/env bash