mirror of
https://github.com/hyprwm/Hyprland.git
synced 2024-12-26 09:15:16 +03:00
Nix & meson: 0.16.0 -> 0.17.0
Nix: make xwayland dependencies optional
This commit is contained in:
parent
2c67c1c4f8
commit
b6e33830af
@ -47,7 +47,7 @@
|
||||
};
|
||||
hyprland = prev.callPackage ./nix/default.nix {
|
||||
stdenv = prev.gcc12Stdenv;
|
||||
version = "0.16.0beta" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
|
||||
version = "0.17.0beta" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")) + "_" + (self.shortRev or "dirty");
|
||||
wlroots = wlroots-hyprland;
|
||||
};
|
||||
hyprland-debug = hyprland.override {debug = true;};
|
||||
|
@ -1,5 +1,5 @@
|
||||
project('Hyprland', 'cpp', 'c',
|
||||
version : '0.16.0beta',
|
||||
version : '0.17.0beta',
|
||||
default_options : [
|
||||
'warning_level=2',
|
||||
'default_library=static',
|
||||
|
@ -62,7 +62,6 @@ in
|
||||
git
|
||||
libdrm
|
||||
libinput
|
||||
libxcb
|
||||
libxkbcommon
|
||||
mesa
|
||||
pango
|
||||
@ -70,9 +69,8 @@ in
|
||||
wayland-protocols
|
||||
wayland-scanner
|
||||
(wlroots.override {inherit enableXWayland hidpiXWayland nvidiaPatches;})
|
||||
xcbutilwm
|
||||
]
|
||||
++ lib.optional enableXWayland xwayland;
|
||||
++ lib.optionals enableXWayland [libxcb xcbutilwm xwayland];
|
||||
|
||||
mesonBuildType =
|
||||
if debug
|
||||
|
Loading…
Reference in New Issue
Block a user