diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index e8da21dba912..a170ac760898 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -49,13 +49,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.38.1"; - + version = "0.39.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-6y422rx8ScSkjR1dNYGYUxBmFewRYlCz9XZZ+XrVZng="; + hash = "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g="; }; patches = [ @@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "@HASH@" '${finalAttrs.src.rev}' \ --replace "@BRANCH@" "" \ --replace "@MESSAGE@" "" \ - --replace "@DATE@" "2024-04-06" \ + --replace "@DATE@" "2024-04-16" \ --replace "@TAG@" "" \ --replace "@DIRTY@" "" ''; @@ -94,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = - [ + wlr.buildInputs ++ [ cairo git hyprcursor diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index d5be9f276cf2..b2f4a52126dc 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -1,4 +1,4 @@ -{ fetchFromGitLab +{ fetchFromGitHub , wlroots , enableXWayland ? true }: @@ -7,12 +7,11 @@ wlroots.overrideAttrs inherit enableXWayland; version = "0.18.0-dev"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "wlroots"; - repo = "wlroots"; - rev = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"; - hash = "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8="; + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "wlroots-hyprland"; + rev = "611a4f24cd2384378f6e500253983107c6656c64"; + hash = "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI="; }; patches = [ ]; # don't inherit old.patches