diff --git a/flake.lock b/flake.lock index ff5a98a..918a369 100755 --- a/flake.lock +++ b/flake.lock @@ -309,23 +309,6 @@ "type": "github" } }, - "metacubexd": { - "flake": false, - "locked": { - "lastModified": 1701612695, - "narHash": "sha256-hFey2goRKGVP3u/xH22kprxyVSyPZGT6ffuDkj2sGMM=", - "owner": "MetaCubeX", - "repo": "metacubexd", - "rev": "cb12a6f49f421f4f6cc80ea225c2314877c72b5f", - "type": "github" - }, - "original": { - "owner": "MetaCubeX", - "ref": "gh-pages", - "repo": "metacubexd", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -520,7 +503,6 @@ "hyprland-protocols": "hyprland-protocols", "impermanence": "impermanence", "lanzaboote": "lanzaboote", - "metacubexd": "metacubexd", "nix-darwin": "nix-darwin", "nixpak": "nixpak", "nixpak-pkgs": "nixpak-pkgs", diff --git a/flake.nix b/flake.nix index 3edfa94..5a2e9ba 100755 --- a/flake.nix +++ b/flake.nix @@ -145,11 +145,6 @@ #}; ## Non-Flake - ### Clash WebUI - metacubexd = { - url = "github:MetaCubeX/metacubexd/gh-pages"; - flake = false; - }; ### My NeoVim configuration nvim = { url = "github:Guanran928/nvim"; @@ -161,6 +156,7 @@ eachSystem = inputs.nixpkgs.lib.genAttrs (import inputs.systems); in { formatter = eachSystem (system: inputs.nixpkgs.legacyPackages.${system}.alejandra); + packages = eachSystem (system: import ./pkgs inputs.nixpkgs.legacyPackages.${system}); ### NixOS nixosConfigurations = { diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..2bdbd9a --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,3 @@ +pkgs: { + metacubexd = pkgs.callPackage ./metacubexd {}; +} diff --git a/pkgs/metacubexd/default.nix b/pkgs/metacubexd/default.nix new file mode 100644 index 0000000..f299075 --- /dev/null +++ b/pkgs/metacubexd/default.nix @@ -0,0 +1,17 @@ +{ + fetchurl, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "metacubexd"; + version = "1.134.0"; + src = fetchurl { + url = "https://github.com/MetaCubeX/metacubexd/releases/download/v${finalAttrs.version}/compressed-dist.tgz"; + hash = "sha256-Xx2UReUAxHg4CrKqGs9vGmWRsosJE1OqnYSmp2wOC9M="; + }; + sourceRoot = "."; + installPhase = '' + mkdir -p $out + cp -r ./* $out + ''; +}) diff --git a/users/guanranwang/darwin/profiles/opt-in/clash-meta-client.nix b/users/guanranwang/darwin/profiles/opt-in/clash-meta-client.nix index a84f276..c42b66d 100644 --- a/users/guanranwang/darwin/profiles/opt-in/clash-meta-client.nix +++ b/users/guanranwang/darwin/profiles/opt-in/clash-meta-client.nix @@ -21,5 +21,5 @@ command = "${pkgs.clash-meta}/bin/clash-meta -d /etc/clash-meta"; }; - environment.etc."clash-meta/metacubexd".source = inputs.metacubexd; + environment.etc."clash-meta/metacubexd".source = inputs.self.packages.${pkgs.system}.metacubexd; } diff --git a/users/guanranwang/nixos/profiles/opt-in/clash-meta-client.nix b/users/guanranwang/nixos/profiles/opt-in/clash-meta-client.nix index 031dde0..214a321 100644 --- a/users/guanranwang/nixos/profiles/opt-in/clash-meta-client.nix +++ b/users/guanranwang/nixos/profiles/opt-in/clash-meta-client.nix @@ -59,5 +59,5 @@ # - https://yacd.haishan.me # - clash-dashboard (buggy): # - https://clash.razord.top - environment.etc."clash-meta/metacubexd".source = inputs.metacubexd; + environment.etc."clash-meta/metacubexd".source = inputs.self.packages.${pkgs.system}.metacubexd; }