From efdda5c51b4daa543099c236892dc8137b950714 Mon Sep 17 00:00:00 2001
From: Lyla Bravo <arqv@protonmail.com>
Date: Sat, 31 Oct 2020 17:36:37 -0300
Subject: [PATCH] Fix Nix derivation

---
 default.nix | 49 ++++++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/default.nix b/default.nix
index 9cb9740..34068dc 100644
--- a/default.nix
+++ b/default.nix
@@ -1,12 +1,9 @@
 let
-  zig-overlay = import (
-    builtins.fetchGit {
-      url = "https://github.com/arqv/zig-overlay.git";
-      rev = "a56601116906a2f192702e0b97487b8e7f796fdc";
-    }
-  );
+  zig-overlay = import (builtins.fetchGit {
+    url = "https://github.com/arqv/zig-overlay.git";
+    rev = "a56601116906a2f192702e0b97487b8e7f796fdc";
+  });
   pkgs = import <nixpkgs> { overlays = [ zig-overlay ]; };
-
   gitignoreSrc = pkgs.fetchFromGitHub {
     owner = "hercules-ci";
     repo = "gitignore";
@@ -14,40 +11,30 @@ let
     sha256 = "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx";
   };
   inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource;
-
   zig-default = pkgs.zig.master;
-in { 
-  zig ? zig-default,
-  extraConfig ? {}
-}:
-
+in { zig ? zig-default, extraConfig ? { } }:
 pkgs.stdenvNoCC.mkDerivation {
   name = "zls";
   version = "master";
   src = gitignoreSource ./.;
-  nativeBuildInputs = [
-    zig
-  ];
-
+  nativeBuildInputs = [ zig ];
   dontConfigure = true;
+  dontInstall = true;
   buildPhase = ''
-    zig build -Drelease-safe=true
-  '';
-  installPhase = ''
     mkdir -p $out
-    zig build install --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}
+      ${
+        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";
 }