From b2627c05c4e92495008628f7ec47c4d0ccbe9354 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Wed, 27 Jul 2022 14:57:27 +0300 Subject: [PATCH] flake & meson: 0.7.0 -> 0.8.1 nix: add legacyRenderer option --- flake.nix | 2 +- meson.build | 2 +- nix/default.nix | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 5ad90c4a..8bbcc755 100644 --- a/flake.nix +++ b/flake.nix @@ -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;}; diff --git a/meson.build b/meson.build index 294b1ef6..9bc80a8a 100644 --- a/meson.build +++ b/meson.build @@ -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') diff --git a/nix/default.nix b/nix/default.nix index 8ad64f2f..b729fd98 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -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