From 7af937b08e0f0718528d1a31c44cc14cdf326f8c Mon Sep 17 00:00:00 2001 From: sodiboo Date: Mon, 2 Dec 2024 03:07:02 +0100 Subject: nix: clang -> rustPlatform.bindgenHook --- flake.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index a5484749..1a7319a1 100644 --- a/flake.nix +++ b/flake.nix @@ -26,10 +26,8 @@ { lib, cairo, - clang, dbus, libGL, - libclang, libdisplay-info, libinput, seatd, @@ -79,7 +77,7 @@ strictDeps = true; nativeBuildInputs = [ - clang + rustPlatform.bindgenHook pkg-config ]; @@ -119,8 +117,6 @@ ''; env = { - LIBCLANG_PATH = lib.getLib libclang + "/lib"; - # Force linking with libEGL and libwayland-client # so they can be discovered by `dlopen()` RUSTFLAGS = toString ( @@ -191,7 +187,7 @@ ]; nativeBuildInputs = [ - pkgs.clang + pkgs.rustPlatform.bindgenHook pkgs.pkg-config pkgs.wrapGAppsHook4 # For `niri-visual-tests` ]; @@ -201,8 +197,6 @@ ]; env = { - inherit (niri) LIBCLANG_PATH; - # WARN: Do not overwrite this variable in your shell! # It is required for `dlopen()` to work on some libraries; see the comment # in the package expression -- cgit