diff options
Diffstat (limited to 'pkgs/applications/window-managers')
3 files changed, 18 insertions, 98 deletions
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 76754dd5f0d8a..9f677165c0c97 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -3,6 +3,7 @@ , pkg-config , stdenv , hyprland +, fetchpatch }: let mkHyprlandPlugin = hyprland: @@ -24,15 +25,27 @@ let hy3 = { fetchFromGitHub, cmake, hyprland }: mkHyprlandPlugin hyprland { pluginName = "hy3"; - version = "0.39.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl0.39.1"; - hash = "sha256-PqVld+oFziSt7VZTNBomPyboaMEAIkerPQFwNJL/Wjw="; + rev = "hl0.40.0"; + hash = "sha256-Y9bIML3C5xyKKv+Yel4LUfSkScwGunOVZkg+Z1dPwHI="; }; + patches = [ + (fetchpatch { + url = "https://github.com/outfoxxed/hy3/commit/33c8d761ff1c1d2264f7549a7bcfc010929d153c.patch"; + hash = "sha256-GcLQ38IVGB6VFMviKqWAM9ayjC2lpWekx3kqrnwsLhk="; + }) + + (fetchpatch { + url = "https://github.com/outfoxxed/hy3/commit/400930e0391a0e13ebbc6a3b9fe162e00aaad89a.patch"; + hash = "sha256-DVrZSkXE4uKrAceGpUZklqrVRzV1CpNRgjpq0uOz0jk="; + }) + ]; + nativeBuildInputs = [ cmake ]; dontStrip = true; diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix index 85ef07039a430..d5df6da46d658 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-mqxnaNiCVJS88Dk4V1v2wdS0RaCbOk8HFOUUbp0Uiy0="; + hash = "sha256-l13c8ALA7ZKDgluYA1C1OfkDGYD6e1/GR6LJnxCLRhA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix deleted file mode 100644 index 698d785a1911e..0000000000000 --- a/pkgs/applications/window-managers/river/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib -, stdenv -, fetchFromGitea -, libGL -, libX11 -, libevdev -, libinput -, libxkbcommon -, pixman -, pkg-config -, scdoc -, udev -, wayland -, wayland-protocols -, wlroots_0_17 -, xwayland -, zig_0_11 -, withManpages ? true -, xwaylandSupport ? true -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "river"; - version = "0.3.1"; - - outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "river"; - repo = "river"; - rev = "refs/tags/v${finalAttrs.version}"; - fetchSubmodules = true; - hash = "sha256-H/908/TP2uzJD1yH4mCXHvorY+4kAhzEkWn6nZGsyBg="; - }; - - nativeBuildInputs = [ - pkg-config - wayland - xwayland - zig_0_11.hook - ] - ++ lib.optional withManpages scdoc; - - buildInputs = [ - libGL - libevdev - libinput - libxkbcommon - pixman - udev - wayland-protocols - wlroots_0_17 - ] ++ lib.optional xwaylandSupport libX11; - - dontConfigure = true; - - zigBuildFlags = lib.optional withManpages "-Dman-pages" - ++ lib.optional xwaylandSupport "-Dxwayland"; - - postInstall = '' - install contrib/river.desktop -Dt $out/share/wayland-sessions - ''; - - passthru.providedSessions = [ "river" ]; - - meta = { - homepage = "https://codeberg.org/river/river"; - description = "A dynamic tiling wayland compositor"; - longDescription = '' - River is a dynamic tiling Wayland compositor with flexible runtime - configuration. - - Its design goals are: - - Simple and predictable behavior, river should be easy to use and have a - low cognitive load. - - Window management based on a stack of views and tags. - - Dynamic layouts generated by external, user-written executables. A - default rivertile layout generator is provided. - - Scriptable configuration and control through a custom Wayland protocol - and separate riverctl binary implementing it. - ''; - changelog = "https://codeberg.org/river/river/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - adamcstephens - moni - rodrgz - ]; - mainProgram = "river"; - platforms = lib.platforms.linux; - }; -}) |