mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-23 01:25:58 +01:00
Merge pull request #274 from fufexan/nix-stuff
nix: add debug package and waybar with -Dexperimental flag
This commit is contained in:
commit
be390dacfd
3 changed files with 12 additions and 4 deletions
|
@ -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:
|
||||
|
|
|
@ -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'])
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
Loading…
Reference in a new issue