Nix & Meson: switch to wlroots-hyprland

flake.nix

@@ -8,10 +8,9 @@
  systems.url = "github:nix-systems/default-linux";
 
  wlroots = {
- type = "gitlab";
- host = "gitlab.freedesktop.org";
- owner = "wlroots";
- repo = "wlroots";
+ type = "github";
+ owner = "hyprwm";
+ repo = "wlroots-hyprland";
  rev = "62eeffbe233d199f520a5755c344e85f8eab7940";
  flake = false;
  };

meson.build

@@ -33,7 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
  add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
 endif
 
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
+wlroots = subproject('wlroots-hyprland', default_options: ['examples=false', 'renderers=gles2'])
 have_xwlr = wlroots.get_variable('features').get('xwayland')
 xcb_dep = dependency('xcb', required: get_option('xwayland'))
 

nix/default.nix

@@ -28,7 +28,7 @@
  wayland,
  wayland-protocols,
  wayland-scanner,
- wlroots,
+ wlroots-hyprland,
  xcbutilwm,
  xwayland,
  debug ? false,
@@ -47,7 +47,7 @@
 assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
 assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
 assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; let
- wlr = wlroots.override {inherit enableXWayland;};
+ wlr = wlroots-hyprland.override {inherit enableXWayland;};
 in
  stdenv.mkDerivation {
  pname = "hyprland${lib.optionalString debug "-debug"}";
@@ -101,7 +101,8 @@ in
  ];
 
  buildInputs =
- [
+ wlr.buildInputs
+ ++ [
  cairo
  git
  hyprcursor.dev

nix/overlays.nix

@@ -34,8 +34,8 @@ in {
  stdenv = final.gcc13Stdenv;
  version = "${props.version}+date=${date}_${self.shortRev or "dirty"}";
  commit = self.rev or "";
- wlroots = final.wlroots-hyprland; # explicit override until decided on breaking change of the name
  udis86 = final.udis86-hyprland; # explicit override until decided on breaking change of the name
+ inherit (final) wlroots-hyprland; # explicit override until decided on breaking change of the name
  inherit date;
  };
  hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};

nix/patches/meson-build.patch

@@ -6,7 +6,7 @@ index 1d2c7f9f..c5ef4e67 100644
  add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
  endif
 
--wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
+-wlroots = subproject('wlroots-hyprland', default_options: ['examples=false', 'renderers=gles2'])
 -have_xwlr = wlroots.get_variable('features').get('xwayland')
 -xcb_dep = dependency('xcb', required: get_option('xwayland'))
 -