diff --git a/flake/packages.nix b/flake/packages.nix index 39d75ca1..cf1f81ac 100644 --- a/flake/packages.nix +++ b/flake/packages.nix @@ -6,7 +6,6 @@ ... }: let docs = import ../docs {inherit pkgs inputs lib;}; - pluginVersion = src: src.shortRev or src.shortDirtyRev or "dirty"; in { packages = { inherit (docs.manual) htmlOpenTool; @@ -67,12 +66,6 @@ Volumes = {"/home/neovim/demo" = {};}; }; }; - - # Plugins that need compiling - blink-cmp = pkgs.callPackage ./packages/blink-cmp.nix { - src = inputs.plugin-blink-cmp; - version = pluginVersion inputs.plugin-blink-cmp; - }; }; }; } diff --git a/modules/wrapper/build/config.nix b/modules/wrapper/build/config.nix index 9a91f2a5..3b90c740 100644 --- a/modules/wrapper/build/config.nix +++ b/modules/wrapper/build/config.nix @@ -50,9 +50,8 @@ pname = "flutter-tools"; patches = [./patches/flutter-tools.patch]; }; - blink-cmp = pkgs.callPackage ../../../flake/packages/blink-cmp.nix { + blink-cmp = pkgs.callPackage ./packages/blink-cmp.nix { src = inputs.plugin-blink-cmp; - # TODO: extract into helper func version = inputs.plugin-blink-cmp.shortRev or inputs.plugin-blink-cmp.shortDirtyRev or "dirty"; }; }; diff --git a/flake/packages/blink-cmp.nix b/modules/wrapper/build/packages/blink-cmp.nix similarity index 100% rename from flake/packages/blink-cmp.nix rename to modules/wrapper/build/packages/blink-cmp.nix