Merge pull request #292415 from uninsane/pr-sway-cross

sway/hyprland: cross compilation fixes

pkgs/applications/window-managers/hyprwm/hyprland/default.nix

@@ -77,6 +77,11 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "@DIRTY@" ""
   '';
 
+  depsBuildBuild = [
+    # to find wayland-scanner when cross-compiling
+    pkg-config
+  ];
+
   nativeBuildInputs = [
     jq
     makeWrapper

pkgs/by-name/wa/waybar/package.nix

@@ -40,10 +40,12 @@
 , udev
 , upower
 , wayland
+, wayland-scanner
 , wireplumber
 , wrapGAppsHook
 
 , cavaSupport ? true
+, enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
 , evdevSupport ? true
 , experimentalPatches ? true
 , hyprlandSupport ? true
@@ -55,7 +57,7 @@
 , pipewireSupport ? true
 , pulseSupport ? true
 , rfkillSupport ? true
-, runTests ? true
+, runTests ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
 , sndioSupport ? true
 , swaySupport ? true
 , traySupport ? true
@@ -97,9 +99,10 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    scdoc
+    wayland-scanner
     wrapGAppsHook
-  ] ++ lib.optional withMediaPlayer gobject-introspection;
+  ] ++ lib.optional withMediaPlayer gobject-introspection
+    ++ lib.optional enableManpages scdoc;
 
   propagatedBuildInputs = lib.optionals withMediaPlayer [
     glib
@@ -107,8 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.pygobject3
   ];
 
-  strictDeps = false;
-
   buildInputs = [
     gtk-layer-shell
     gtkmm3
@@ -154,7 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
     "libinput" = inputSupport;
     "libnl" = nlSupport;
     "libudev" = udevSupport;
-    "man-pages" = true;
+    "man-pages" = enableManpages;
     "mpd" = mpdSupport;
     "mpris" = mprisSupport;
     "pipewire" = pipewireSupport;

pkgs/development/libraries/wlroots/default.nix

@@ -127,9 +127,11 @@ rec {
   wlroots_0_17 = generic {
     version = "0.17.3";
     hash = "sha256-jth6BKci3sVDC86o+gSHKyDWnibVcNmipm7nn0S6LTg=";
+    extraNativeBuildInputs = [
+      hwdata
+    ];
     extraBuildInputs = [
       ffmpeg
-      hwdata
       libliftoff
       libdisplay-info
     ];