diff options
| author | Mihai Fufezan <[email protected]> | 2024-04-12 20:35:31 +0300 |
|---|---|---|
| committer | Mihai Fufezan <[email protected]> | 2024-04-12 20:39:00 +0300 |
| commit | d8d0d3b20bdb4e4320989349dacd6deb17cfb619 (patch) | |
| tree | e64d1896bc84646f82b9e18165aa1534a60b0bd3 /nix | |
| parent | 382b6d3f6b26284388cfe3181c447f11a8dc9bee (diff) | |
| download | Hyprland-d8d0d3b20bdb4e4320989349dacd6deb17cfb619.tar.gz Hyprland-d8d0d3b20bdb4e4320989349dacd6deb17cfb619.zip | |
Nix & Meson: switch to wlroots-hyprland
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/default.nix | 7 | ||||
| -rw-r--r-- | nix/overlays.nix | 2 | ||||
| -rw-r--r-- | nix/patches/meson-build.patch | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/nix/default.nix b/nix/default.nix index 907c6fec..a7679672 100644 --- a/nix/default.nix +++ b/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 diff --git a/nix/overlays.nix b/nix/overlays.nix index c216ff53..97e66912 100644 --- a/nix/overlays.nix +++ b/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;}; diff --git a/nix/patches/meson-build.patch b/nix/patches/meson-build.patch index 7f372107..21cec8ee 100644 --- a/nix/patches/meson-build.patch +++ b/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')) - |