diff options
Diffstat (limited to 'pkgs/applications/window-managers')
3 files changed, 19 insertions, 18 deletions
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 92694db761a4..3db57a6b8dd2 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -9,6 +9,7 @@ , cairo , git , hyprland-protocols +, hyprlang , jq , libGL , libdrm @@ -31,7 +32,7 @@ , debug ? false , enableXWayland ? true , legacyRenderer ? false -, withSystemd ? true +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , wrapRuntimeDeps ? true # deprecated flags , nvidiaPatches ? false @@ -43,13 +44,13 @@ assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` ha assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig="; + hash = "sha256-oZe4k6jtO/0govmERGcbeyvE9EfTvXY5bnyIs6AsL9U="; }; patches = [ @@ -92,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { cairo git hyprland-protocols + hyprlang libGL libdrm libinput @@ -116,10 +118,10 @@ stdenv.mkDerivation (finalAttrs: { mesonAutoFeatures = "disabled"; - mesonFlags = builtins.concatLists [ - (lib.optional enableXWayland "-Dxwayland=enabled") - (lib.optional legacyRenderer "-Dlegacy_renderer=enabled") - (lib.optional withSystemd "-Dsystemd=enabled") + mesonFlags = [ + (lib.mesonEnable "xwayland" enableXWayland) + (lib.mesonEnable "legacy_renderer" legacyRenderer) + (lib.mesonEnable "systemd" withSystemd) ]; postInstall = '' diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 421d0d328539..4992e18b6bee 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -5,7 +5,7 @@ , hyprland }: let - mkHyprlandPlugin = + mkHyprlandPlugin = hyprland: args@{ pluginName, ... }: stdenv.mkDerivation (args // { pname = "${pluginName}"; @@ -14,23 +14,23 @@ let ++ hyprland.buildInputs ++ (args.buildInputs or [ ]); meta = args.meta // { - description = (args.meta.description or ""); - longDescription = (args.meta.lonqDescription or "") + + description = args.meta.description or ""; + longDescription = (args.meta.longDescription or "") + "\n\nPlugins can be installed via a plugin entry in the Hyprland NixOS or Home Manager options."; }; }); plugins = { hy3 = { fetchFromGitHub, cmake, hyprland }: - mkHyprlandPlugin rec { + mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.35.0"; + version = "unstable-2024-02-23"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl${version}"; - hash = "sha256-lFe7Lf0K5ePTh4gflnvBohOGH4ayGDtNkbg/XtoNqRo="; + rev = "029a2001361d2a4cbbe7447968dee5d1b1880298"; + hash = "sha256-8LKCXwNU6wA8o6O7s9T2sLWbYNHaI1tYU4YMjHkNLZQ="; }; nativeBuildInputs = [ cmake ]; @@ -47,5 +47,4 @@ let }; }; in -lib.mapAttrs (name: plugin: callPackage plugin { }) plugins - +(lib.mapAttrs (name: plugin: callPackage plugin { }) plugins) // { inherit mkHyprlandPlugin; } diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index a2b2f96769d7..5c42eff6fc8c 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -9,8 +9,8 @@ wlroots.overrideAttrs domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "00b869c1a96f300a8f25da95d624524895e0ddf2"; - hash = "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM="; + rev = "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5"; + hash = "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI="; }; patches = [ ]; # don't inherit old.patches |