ycmd: correct gopls package and link path (#352222)

This commit is contained in:
Sandro
2025-01-24 09:30:28 +01:00
committed by GitHub
3 changed files with 15 additions and 6 deletions
+8
View File
@@ -14701,6 +14701,14 @@
githubId = 8263431;
name = "Matt Miemiec";
};
mel = {
email = "mel@rnrd.eu";
github = "melnary";
githubId = 10659529;
matrix = "@mel:rnrd.eu";
name = "Mel G.";
keys = [ { fingerprint = "D75A C286 ACA7 00B4 D8EC 377D 2082 F8EC 11CC 009B"; } ];
};
melchips = {
email = "truphemus.francois@gmail.com";
github = "melchips";
@@ -3822,6 +3822,7 @@ in
maintainers = with maintainers; [
marcweber
jagajaga
mel
];
platforms = platforms.unix;
};
+6 -6
View File
@@ -6,8 +6,8 @@
, python
, withGodef ? true
, godef
, withGotools ? true
, gotools
, withGopls ? true
, gopls
, withRustAnalyzer ? true
, rust-analyzer
, withTypescript ? true
@@ -80,10 +80,10 @@ stdenv.mkDerivation {
TARGET=$out/lib/ycmd/third_party/godef
mkdir -p $TARGET
ln -sf ${godef}/bin/godef $TARGET
'' + lib.optionalString withGotools ''
TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls
'' + lib.optionalString withGopls ''
TARGET=$out/lib/ycmd/third_party/go/bin
mkdir -p $TARGET
ln -sf ${gotools}/bin/gopls $TARGET
ln -sf ${gopls}/bin/gopls $TARGET
'' + lib.optionalString withRustAnalyzer ''
TARGET=$out/lib/ycmd/third_party/rust-analyzer
mkdir -p $TARGET
@@ -105,7 +105,7 @@ stdenv.mkDerivation {
mainProgram = "ycmd";
homepage = "https://github.com/ycm-core/ycmd";
license = licenses.gpl3;
maintainers = with maintainers; [ rasendubi lnl7 siriobalmelli ];
maintainers = with maintainers; [ rasendubi lnl7 mel ];
platforms = platforms.all;
};
}