andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Nix build

Browse Source 
The older version of `zig-overlay` used was unable to handle the newer
directory layout of Zig tarballs, so `zig-overlay` has been updated and
is currently using a `master` version of Zig.

Additionally, `zls.json` was removed since `zls` will now only look for
it in local or global configuration folders.

Closes #330.
This commit is contained in:
Benjamin Tan 2021-06-05 23:47:37 +08:00
parent b756ed4da5
commit f43214ddd0
No known key found for this signature in database
GPG Key ID: A853F0716C413825
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
default.nix
View File

@ -1,9 +1,11 @@
let let
zig-overlay = import (builtins.fetchGit { pkgs = import <nixpkgs> {};
url = "https://github.com/arqv/zig-overlay.git"; zig-overlay = pkgs.fetchFromGitHub {
rev = "a56601116906a2f192702e0b97487b8e7f796fdc"; owner = "arqv";
}); repo = "zig-overlay";
pkgs = import <nixpkgs> { overlays = [ zig-overlay ]; }; rev = "5b9504b8bff072553051d6e130727f7f5c0715c3";
sha256 = "sha256-NDm5qT6/qr789IhI2dsQxrR5/Mr7cXVj17x/+tl3pDE=";
};
gitignoreSrc = pkgs.fetchFromGitHub { gitignoreSrc = pkgs.fetchFromGitHub {
owner = "hercules-ci"; owner = "hercules-ci";
repo = "gitignore"; repo = "gitignore";
@ -11,7 +13,7 @@ let
sha256 = "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx"; sha256 = "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx";
}; };
inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource; inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource;
zig-default = pkgs.zig.master; zig-default = (import zig-overlay { inherit pkgs; }).master.latest;
in { zig ? zig-default, extraConfig ? { } }: in { zig ? zig-default, extraConfig ? { } }:
pkgs.stdenvNoCC.mkDerivation { pkgs.stdenvNoCC.mkDerivation {
name = "zls"; name = "zls";
@ -23,18 +25,6 @@ pkgs.stdenvNoCC.mkDerivation {
buildPhase = '' buildPhase = ''
mkdir -p $out mkdir -p $out
zig build install -Drelease-safe=true -Ddata_version=master --prefix $out zig build install -Drelease-safe=true -Ddata_version=master --prefix $out
cat << EOF > $out/bin/zls.json
${
builtins.toJSON ({
zig_lib_path = "${zig}/lib/zig/";
zig_exe_path = "${zig}/bin/zig";
warn_style = false;
enable_snippets = false;
enable_semantic_tokens = false;
operator_completions = true;
} // extraConfig)
}
EOF
''; '';
XDG_CACHE_HOME = ".cache"; XDG_CACHE_HOME = ".cache";
} }