switch to new window_manager from main

linux/nix/devshell.nix

@@ -36,7 +36,13 @@ pkgs.mkShell {
       })
       android.platform-tools
     ]
-    ++ lib.optional pkgs.stdenv.isLinux wayland;
+    ++ 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 = rec {
     LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.libclang ];

linux/nix/pkg/default.nix

@@ -3,6 +3,8 @@
   callPackage,
   mpv-unwrapped,
   libass,
+  libxext,
+  libxfixes,
   libclang,
   flutter,
   stdenv,
@@ -25,9 +27,14 @@ flutter.buildFlutterApplication {
     "--dart-define=GIT_COMMIT=${commit}"
   ];
 
+  nativeBuildInputs = [ (callPackage ./hook_pkg_config.nix { }) ];
+
   buildInputs = [
     mpv-unwrapped
     libass
+    # nativeapi includes XInput2.h, which needs these, but xi.pc only lists them privately
+    libxext
+    libxfixes
   ];
 
   env.LIBCLANG_PATH = lib.makeLibraryPath [ libclang ];
@@ -42,9 +49,10 @@ flutter.buildFlutterApplication {
     m3e_design = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI=";
     native_toolchain_cmake = "sha256-/drnHZebmTnsCnHgC1xmlAe+U4PSrjw5Sm9axicuTrY=";
     navigation_rail_m3e = "sha256-5V9m6yY0jimx2gh7lQHYg4HDKQ4Wrl0ATmBhw5DkQMI=";
-    unifiedpush_linux = "sha256-aIF/8oabSuuZo7K6qr4r7UBmf57qgoGAXyJ40fdntuQ=";
-    unifiedpush_platform_interface = "sha256-aIF/8oabSuuZo7K6qr4r7UBmf57qgoGAXyJ40fdntuQ=";
+    unifiedpush_linux = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4=";
+    unifiedpush_platform_interface = "sha256-KQKyBPL2ORK9O89C4K3RHGve/lvFaU1vIjSDnj6+bj4=";
     webcrypto = "sha256-HW0NukbddwOYd9iVUFA3L8iy1qggnyOBgcbMj0MTYss=";
+    window_manager = "sha256-xUd5hG+/V6F+m0ZUL/3XGPACFG/zqI5JM6IaMVvLgx4=";
     xdg_desktop_portal = "sha256-8GgiXHGv+wy6hJgj/rZxbymMitNVmdDLAnedZm9STSc=";
   };
 

linux/nix/pkg/hook_pkg_config.nix

@@ -0,0 +1,32 @@
+{
+  stdenvNoCC,
+  pkg-config,
+  pkg-config-unwrapped,
+  makeWrapper,
+  gtk3,
+  libx11,
+  libxi,
+}:
+
+# Build hooks run with a filtered environment that drops PKG_CONFIG_PATH, so
+# nativeapi's hook can only find its libraries through a pkg-config on PATH.
+stdenvNoCC.mkDerivation {
+  name = "hook-pkg-config";
+  dontUnpack = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    gtk3
+    libx11
+    libxi
+  ];
+
+  installPhase = ''
+    makeWrapper ${pkg-config-unwrapped}/bin/pkg-config $out/bin/pkg-config \
+      --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH"
+  '';
+}