From 504b06dd029b334f64c891b90a7b7739dfb35217 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Thu, 12 Nov 2026 22:21:13 -0500 Subject: [PATCH] set NIX_CFLAGS_COMPILE explicitly to fix CI --- linux/nix/build_env.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/linux/nix/build_env.nix b/linux/nix/build_env.nix index 01b810c..9709a7a 100644 --- a/linux/nix/build_env.nix +++ b/linux/nix/build_env.nix @@ -20,13 +20,20 @@ ] ++ lib.optionals pkgs.stdenv.isLinux [ wayland - # nativeapi includes XInput2.h, which needs these, but xi.pc only lists them privately - libxext - libxfixes (callPackage ./pkg/hook_pkg_config.nix { }) ]; env = lib.optionalAttrs pkgs.stdenv.isLinux { + # nativeapi includes XInput2.h and GTK's Wayland headers, which need these, but xi.pc and gdk-3.0.pc + # only list them privately, so its hook's pkg-config doesn't return them. Hooks only get NIX_ variables. + NIX_CFLAGS_COMPILE = lib.concatMapStringsSep " " (pkg: "-isystem ${lib.getDev pkg}/include") ( + with pkgs; + [ + libxext + libxfixes + wayland + ] + ); # better_player loads libmpv at runtime to play videos LD_LIBRARY_PATH = "./build/native_assets/linux:${ lib.makeLibraryPath [