summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Fufezan <fufexan@protonmail.com>2022-10-31 12:41:31 +0200
committerMihai Fufezan <fufexan@protonmail.com>2022-10-31 12:41:31 +0200
commitb6e33830af1a89a2cfbef446de1fc37e8a2b40e3 (patch)
tree395bd68319febc3d35831474113556dea1de66aa
parent2c67c1c4f80f2a1312dfec4624b570cf57058063 (diff)
Nix & meson: 0.16.0 -> 0.17.0
Nix: make xwayland dependencies optional
-rw-r--r--flake.nix2
-rw-r--r--meson.build2
-rw-r--r--nix/default.nix4
3 files changed, 3 insertions, 5 deletions
diff --git a/flake.nix b/flake.nix
index da71b374..14f47a8c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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;};
diff --git a/meson.build b/meson.build
index 498fa765..ede94a7c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('Hyprland', 'cpp', 'c',
- version : '0.16.0beta',
+ version : '0.17.0beta',
default_options : [
'warning_level=2',
'default_library=static',
diff --git a/nix/default.nix b/nix/default.nix
index 27aaf6bc..ce2620a6 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -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