flake & meson: 0.7.0 -> 0.8.1

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

View file

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

View file

@ -1,5 +1,5 @@
project('Hyprland', 'cpp', 'c',
version : '0.7.0beta',
version : '0.8.1beta',
default_options : ['warning_level=2', 'default_library=static', 'optimization=3'])
add_global_arguments('-std=c++23', language: 'cpp')

View file

@ -18,9 +18,10 @@
wlroots,
xcbutilwm,
xwayland,
enableXWayland ? true,
version ? "git",
debug ? false,
enableXWayland ? true,
legacyRenderer ? false,
version ? "git",
}:
stdenv.mkDerivation {
pname = "hyprland" + lib.optionalString debug "-debug";
@ -54,7 +55,10 @@ stdenv.mkDerivation {
then "debug"
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 = [
# make meson use the provided wlroots instead of the git submodule