hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-02-17 03:22:31 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #274 from fufexan/nix-stuff

Browse source 
nix: add debug package and waybar with -Dexperimental flag
This commit is contained in:
Mihai Fufezan 2022-06-29 20:57:18 +03:00 • committed by GitHub
commit be390dacfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -32,9 +32,13 @@
src = inputs.wlroots; src = inputs.wlroots;
}); });
hyprland = prev.callPackage ./nix/default.nix { 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; wlroots = wlroots-hyprland;
}; };
hyprland-debug = hyprland.override {debug = true;};
waybar-hyprland = prev.waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
});
}; };
packages = genSystems (system: packages = genSystems (system:

2
meson.build
View file

@ -1,5 +1,5 @@
project('Hyprland', 'cpp', 'c', project('Hyprland', 'cpp', 'c',
version : '0.6.0beta', version : '0.6.2beta',
default_options : ['warning_level=3', 'cpp_std=c++20', 'default_library=static']) default_options : ['warning_level=3', 'cpp_std=c++20', 'default_library=static'])
wlroots = subproject('wlroots', default_options: ['examples=false']) wlroots = subproject('wlroots', default_options: ['examples=false'])

8
nix/default.nix
View file

@ -20,9 +20,10 @@
xwayland, xwayland,
enableXWayland ? true, enableXWayland ? true,
version ? "git", version ? "git",
debug ? false,
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "hyprland"; pname = "hyprland" + lib.optionalString debug "-debug";
inherit version; inherit version;
src = ../.; src = ../.;
@ -48,7 +49,10 @@ stdenv.mkDerivation {
] ]
++ lib.optional enableXWayland xwayland; ++ lib.optional enableXWayland xwayland;
mesonBuildType = "release"; mesonBuildType =
if debug
then "debug"
else "release";
mesonFlags = lib.optional (!enableXWayland) "-DNO_XWAYLAND=true"; mesonFlags = lib.optional (!enableXWayland) "-DNO_XWAYLAND=true";