marcoallegretti/WEFT_OS
marcoallegretti/WEFT_OS
1
0
Fork 0
mirror of https://github.com/marcoallegretti/WEFT_OS.git synced 2026-03-27 01:13:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build(nix): fix compositor link: append gbm/libinput paths to NIX_LDFLAGS via preBuild hook

Browse source
This commit is contained in:
Marco Allegretti 2026-03-12 22:04:43 +01:00
parent c695b420be
commit fe077c69e1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
infra/nixos/weft-packages.nix
View file

@ -22,8 +22,8 @@ let
nativeBuildInputs = with pkgs; [ pkg-config ]; nativeBuildInputs = with pkgs; [ pkg-config ];
}; };
mkWeftPkg = { pname, extraBuildInputs ? [], extraNativeBuildInputs ? [], cargoFlags ? [], extraEnv ? {} }: rustPlatform.buildRustPackage (commonArgs // { mkWeftPkg = { pname, extraBuildInputs ? [], extraNativeBuildInputs ? [], cargoFlags ? [], extraEnv ? {}, preBuild ? "" }: rustPlatform.buildRustPackage (commonArgs // {
inherit pname; inherit pname preBuild;
cargoBuildFlags = [ "--package" pname ] ++ cargoFlags; cargoBuildFlags = [ "--package" pname ] ++ cargoFlags;
cargoTestFlags = [ "--package" pname ]; cargoTestFlags = [ "--package" pname ];
buildInputs = extraBuildInputs; buildInputs = extraBuildInputs;
@ -39,9 +39,9 @@ in {
libdrm mesa wayland libxkbcommon seatd udev dbus libGL libdisplay-info libinput libdrm mesa wayland libxkbcommon seatd udev dbus libGL libdisplay-info libinput
]; ];
extraNativeBuildInputs = with pkgs; [ wayland-scanner ]; extraNativeBuildInputs = with pkgs; [ wayland-scanner ];
extraEnv = { preBuild = ''
NIX_LDFLAGS = "-L${pkgs.mesa}/lib -L${pkgs.libinput}/lib"; 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)"
}; '';
}; };
weft-servo-shell = mkWeftPkg { weft-servo-shell = mkWeftPkg {