Use upstream jsonrpc again

mweinelt · Jun 7, 2021 · d5de918 · d5de918
1 parent 8d6fad4
commit d5de918
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/helix-lsp/Cargo.toml b/helix-lsp/Cargo.toml
@@ -22,8 +22,7 @@ glob = "0.3"
 anyhow = "1"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-# jsonrpc-core = { version = "17.1", default-features = false } # don't pull in all of futures
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", default-features = false } # don't pull in all of futures
+jsonrpc-core = { version = "17.1", default-features = false } # don't pull in all of futures
 futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
 thiserror = "1.0"
 log = "~0.4"
diff --git a/shell.nix b/shell.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs }:
+{ lib, stdenv, pkgs }:
 
 pkgs.mkShell {
   nativeBuildInputs = with pkgs; [
@@ -12,7 +12,9 @@ pkgs.mkShell {
   RUSTFLAGS = "-C link-arg=-fuse-ld=lld -C target-cpu=native";
   RUST_BACKTRACE = "1";
   # https://github.com/rust-lang/rust/issues/55979
-  LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib64:$LD_LIBRARY_PATH";
+  LD_LIBRARY_PATH = lib.makeLibraryPath (with pkgs; [
+    stdenv.cc.cc.lib
+  ]);
 
   shellHook = ''
     export HELIX_RUNTIME=$PWD/runtime