From d5de9183ef8392168b06131278554e483eddfff3 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Mon, 7 Jun 2021 21:33:17 +0900
Subject: Use upstream jsonrpc again

---
 shell.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'shell.nix')

diff --git a/shell.nix b/shell.nix
index 9e7bce9b..d6cb543a 100644
--- 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
-- 
cgit v1.2.3-70-g09d2