hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 07:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Nix & meson: 0.16.0 -> 0.17.0

Browse source 
Nix: make xwayland dependencies optional
This commit is contained in:
Mihai Fufezan 2022-10-31 12:41:31 +02:00
parent 2c67c1c4f8
commit b6e33830af
No known key found for this signature in database
GPG key ID: 5899325F2F120900
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -47,7 +47,7 @@
}; };
hyprland = prev.callPackage ./nix/default.nix { hyprland = prev.callPackage ./nix/default.nix {
stdenv = prev.gcc12Stdenv; 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; wlroots = wlroots-hyprland;
}; };
hyprland-debug = hyprland.override {debug = true;}; hyprland-debug = hyprland.override {debug = true;};

2
meson.build
View file

@ -1,5 +1,5 @@
project('Hyprland', 'cpp', 'c', project('Hyprland', 'cpp', 'c',
version : '0.16.0beta', version : '0.17.0beta',
default_options : [ default_options : [
'warning_level=2', 'warning_level=2',
'default_library=static', 'default_library=static',

4
nix/default.nix
View file

@ -62,7 +62,6 @@ in
git git
libdrm libdrm
libinput libinput
libxcb
libxkbcommon libxkbcommon
mesa mesa
pango pango
@ -70,9 +69,8 @@ in
wayland-protocols wayland-protocols
wayland-scanner wayland-scanner
(wlroots.override {inherit enableXWayland hidpiXWayland nvidiaPatches;}) (wlroots.override {inherit enableXWayland hidpiXWayland nvidiaPatches;})
xcbutilwm
] ]
++ lib.optional enableXWayland xwayland; ++ lib.optionals enableXWayland [libxcb xcbutilwm xwayland];
mesonBuildType = mesonBuildType =
if debug if debug