From 09ac7b59c95446179416f634d69506135fd5fc5e Mon Sep 17 00:00:00 2001 From: specCon18 Date: Thu, 22 Feb 2024 16:45:42 -0500 Subject: [PATCH] fixed issues with clang path on nix --- nix/default.nix | 4 +++- nix/devshell.nix | 10 ++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/nix/default.nix b/nix/default.nix index ca7fd27..07c08c2 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -7,6 +7,8 @@ pkgs.rustPlatform.buildRustPackage rec { src = pkgs.lib.cleanSource ../.; buildInputs = with pkgs; [ surrealdb + clang ]; # doCheck = false; -} \ No newline at end of file + LIBCLANG_PATH="${pkgs.llvmPackages.libclang.lib}/lib"; +} diff --git a/nix/devshell.nix b/nix/devshell.nix index 9d95364..294fb06 100644 --- a/nix/devshell.nix +++ b/nix/devshell.nix @@ -1,10 +1,4 @@ { pkgs ? import { } }: -let - runtimeLibs = [ - pkgs.libclang - pkgs.rocksdb - ]; -in pkgs.mkShell { # Get dependencies from the main package inputsFrom = [ (pkgs.callPackage ./default.nix { }) ]; @@ -20,7 +14,7 @@ in bacon nodePackages_latest.pnpm surrealdb - libclang + clang ]; - LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath runtimeLibs}"; + LIBCLANG_PATH="${pkgs.llvmPackages.libclang.lib}/lib"; }