From f987f236467b3ca594686eef00b68de892c5314f Mon Sep 17 00:00:00 2001 From: Marco Allegretti Date: Thu, 12 Mar 2026 22:09:38 +0100 Subject: [PATCH] build(nix): use RUSTFLAGS to pass gbm/libinput library paths to linker --- infra/nixos/weft-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/infra/nixos/weft-packages.nix b/infra/nixos/weft-packages.nix index 8f84fe3..21bccd8 100644 --- a/infra/nixos/weft-packages.nix +++ b/infra/nixos/weft-packages.nix @@ -39,9 +39,9 @@ in { libdrm mesa wayland libxkbcommon seatd udev dbus libGL libdisplay-info libinput ]; extraNativeBuildInputs = with pkgs; [ wayland-scanner ]; - preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS $(pkg-config --libs-only-L gbm 2>/dev/null || echo) $(pkg-config --libs-only-L libinput 2>/dev/null || echo)" - ''; + extraEnv = { + RUSTFLAGS = "-L${pkgs.mesa}/lib -L${pkgs.libinput}/lib"; + }; }; weft-servo-shell = mkWeftPkg {