From cbf3595e96e8d80ff3badc5172a115532e68ba94 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Wed, 29 Jun 2022 14:46:41 +0300 Subject: [PATCH 1/2] nix: add debug package and waybar with -Dexperimental flag --- flake.nix | 6 +++++- nix/default.nix | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index aff05d7f..b1f621fc 100644 --- a/flake.nix +++ b/flake.nix @@ -32,9 +32,13 @@ src = inputs.wlroots; }); hyprland = prev.callPackage ./nix/default.nix { - version = "0.6.0beta" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")); + version = "0.6.2beta" + "+date=" + (mkDate (self.lastModifiedDate or "19700101")); wlroots = wlroots-hyprland; }; + hyprland-debug = hyprland.override {debug = true;}; + waybar-hyprland = prev.waybar.overrideAttrs (oldAttrs: { + mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"]; + }); }; packages = genSystems (system: diff --git a/nix/default.nix b/nix/default.nix index 18570f12..495345fd 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -20,9 +20,10 @@ xwayland, enableXWayland ? true, version ? "git", + debug ? false, }: stdenv.mkDerivation { - pname = "hyprland"; + pname = "hyprland" + lib.optionalString debug "-debug"; inherit version; src = ../.; @@ -48,7 +49,10 @@ stdenv.mkDerivation { ] ++ lib.optional enableXWayland xwayland; - mesonBuildType = "release"; + mesonBuildType = + if debug + then "debug" + else "release"; mesonFlags = lib.optional (!enableXWayland) "-DNO_XWAYLAND=true"; From dc83110c053cd77501202a9c3efd031af4d0f43c Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Wed, 29 Jun 2022 14:50:19 +0300 Subject: [PATCH 2/2] nix & meson: 0.6.0 -> 0.6.2 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 7c075e4e..18a4c709 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('Hyprland', 'cpp', 'c', - version : '0.6.0beta', + version : '0.6.2beta', default_options : ['warning_level=3', 'cpp_std=c++20', 'default_library=static']) wlroots = subproject('wlroots', default_options: ['examples=false'])