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

flake & meson: 0.7.0 -> 0.8.1

Browse source 
nix: add legacyRenderer option
This commit is contained in:
Mihai Fufezan 2022-07-27 14:57:27 +03:00
parent 427bc35b6b
commit b2627c05c4
No known key found for this signature in database
GPG key ID: 5899325F2F120900
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -33,7 +33,7 @@
}); });
hyprland = prev.callPackage ./nix/default.nix { hyprland = prev.callPackage ./nix/default.nix {
stdenv = prev.gcc12Stdenv; stdenv = prev.gcc12Stdenv;
version = "0.7.0beta" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")); version = "0.8.1beta" + "+date=" + (mkDate (self.lastModifiedDate or "19700101"));
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.7.0beta', version : '0.8.1beta',
default_options : ['warning_level=2', 'default_library=static', 'optimization=3']) default_options : ['warning_level=2', 'default_library=static', 'optimization=3'])
add_global_arguments('-std=c++23', language: 'cpp') add_global_arguments('-std=c++23', language: 'cpp')

10
nix/default.nix
View file

@ -18,9 +18,10 @@
wlroots, wlroots,
xcbutilwm, xcbutilwm,
xwayland, xwayland,
enableXWayland ? true,
version ? "git",
debug ? false, debug ? false,
enableXWayland ? true,
legacyRenderer ? false,
version ? "git",
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "hyprland" + lib.optionalString debug "-debug"; pname = "hyprland" + lib.optionalString debug "-debug";
@ -54,7 +55,10 @@ stdenv.mkDerivation {
then "debug" then "debug"
else "release"; else "release";
mesonFlags = lib.optional (!enableXWayland) "-DNO_XWAYLAND=true"; mesonFlags = builtins.concatLists [
(lib.optional (!enableXWayland) "-DNO_XWAYLAND=true")
(lib.optional (legacyRenderer) "-DLEGACY_RENDERER:STRING=true")
];
patches = [ patches = [
# make meson use the provided wlroots instead of the git submodule # make meson use the provided wlroots instead of the git submodule