diff options
| -rw-r--r-- | modules/vim.nix | 3 | ||||
| -rw-r--r-- | pkgs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/youcompleteme.nix | 32 |
3 files changed, 2 insertions, 35 deletions
diff --git a/modules/vim.nix b/modules/vim.nix index eb5d794..d57a961 100644 --- a/modules/vim.nix +++ b/modules/vim.nix @@ -42,7 +42,8 @@ let vim-sleuth vim-better-whitespace vim-tmux-navigator - ] ++ (with auxiliaryPkgs; [ youcompleteme ]); + YouCompleteMe + ]; opt = [ ]; }; diff --git a/pkgs/default.nix b/pkgs/default.nix index f5e83a9..7b8a61b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -5,8 +5,6 @@ bluesky = with pkgs; lib.recurseIntoAttrs (callPackage ./bluesky { }); - youcompleteme = pkgs.callPackage ./youcompleteme.nix { }; - inherit (pkgs.callPackages ./jellyfin-edited.nix { jellyfin-prev = pkgs.jellyfin; jellyfin-web-prev = pkgs.jellyfin-web; diff --git a/pkgs/youcompleteme.nix b/pkgs/youcompleteme.nix deleted file mode 100644 index 190e4b5..0000000 --- a/pkgs/youcompleteme.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - ycmd, - vimPlugins, - gopls, - ... -}: - -let - ycmd-go = ycmd.overrideAttrs ( - final: prev: { - pname = prev.pname + "-go"; - - installPhase = - prev.installPhase - + '' - TARGET=$out/lib/ycmd/third_party/go/bin - mkdir -p $TARGET - ln -sf ${gopls}/bin/gopls $TARGET - ''; - } - ); -in -vimPlugins.YouCompleteMe.overrideAttrs ( - final: prev: { - buildPhase = - prev.buildPhase - + '' - rm third_party/ycmd - ln -s ${ycmd-go}/lib/ycmd third_party - ''; - } -) |