diff options
Diffstat (limited to 'pkgs/applications/window-managers')
12 files changed, 105 insertions, 20 deletions
diff --git a/pkgs/applications/window-managers/dwl/default.nix b/pkgs/applications/window-managers/dwl/default.nix index 0af274265bff..68815952b17f 100644 --- a/pkgs/applications/window-managers/dwl/default.nix +++ b/pkgs/applications/window-managers/dwl/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitea , installShellFiles , libX11 , libinput @@ -24,8 +24,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "dwl"; version = "0.5"; - src = fetchFromGitHub { - owner = "djpohly"; + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dwl"; repo = "dwl"; rev = "v${finalAttrs.version}"; hash = "sha256-U/vqGE1dJKgEGTfPMw02z5KJbZLWY1vwDJWnJxT8urM="; diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index a0dbb3660d31..017a1ab0fe95 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "evilwm"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { url = "http://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz"; - sha256 = "sha256-QhLW2QywBbLMiIFLyFN3NrSVCrWCZLu2W4gHrGO9xLk="; + sha256 = "sha256-1ZRbILEskdskEvrA29o/ucPsjeu44bEJg4mSsrG75dQ="; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 4992e18b6bee..1aef74294bd5 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -24,13 +24,13 @@ let hy3 = { fetchFromGitHub, cmake, hyprland }: mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "unstable-2024-02-23"; + version = "0.36.0"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "029a2001361d2a4cbbe7447968dee5d1b1880298"; - hash = "sha256-8LKCXwNU6wA8o6O7s9T2sLWbYNHaI1tYU4YMjHkNLZQ="; + rev = "hl${version}"; + hash = "sha256-nRBeHh0Vr0gB3BHiqP9ZE4/yyZvRt8jJHwBF5lFu/24="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix index f76a8063388d..65f612136dfa 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hyprshade"; - version = "3.1.0"; + version = "3.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "loqusion"; repo = "hyprshade"; rev = "refs/tags/${version}"; - hash = "sha256-bH+QXvZ+Yaogcp/MYJopiAUvM/imNrSo+cotTzzdlV8="; + hash = "sha256-bNgXnN4F9kzbi1vTuBqn8H7A8QMznr7QA65eNLumkAA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 9d21716bc704..d7f1bc2176a8 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -67,6 +67,7 @@ stdenv.mkDerivation rec { description = "A tiling window manager"; homepage = "https://i3wm.org"; maintainers = with maintainers; [ modulistic fpletz ]; + mainProgram = "i3"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index b7cca2b66376..41096a70a68d 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "i3lock"; - version = "2.14.1"; + version = "2.15"; src = fetchFromGitHub { owner = "i3"; repo = "i3lock"; rev = version; - sha256 = "sha256-cC908c47fkU6msLqZSxpEbKxO1/PatH81QeuCzBSZGw="; + sha256 = "sha256-OyV6GSLnNV3GUqrfs3OBnIaBvicH2PXgeY4acOk5dR4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index b8528a374125..b1d60032db36 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "unstable-2024-02-14"; + version = "unstable-2024-03-06"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "ad4d311269dc25789f7412211ddddad383d9700c"; - hash = "sha256-kPrsyrAHvwrktBFITuhpFKyjmedv04ONFhuxiBDlAJA="; + rev = "d58ec46b38aa1c18bbe5c3a0ba2ccdf73b069ee9"; + hash = "sha256-0zbiSAF0T/OwRn5CYv2fLL4J3K5gUOmy3GK70RfXv5Y="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/owl/default.nix b/pkgs/applications/window-managers/owl/default.nix index fa9ea8e8b6a1..d3f018eb1202 100644 --- a/pkgs/applications/window-managers/owl/default.nix +++ b/pkgs/applications/window-managers/owl/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, clangStdenv , fetchFromGitHub , gnustep , libxkbcommon @@ -12,9 +12,10 @@ assert wayland.withLibraries; let - mkDerivation = if stdenv.isDarwin then stdenv.mkDerivation else gnustep.gsmakeDerivation; + stdenv = clangStdenv; in -mkDerivation { + +stdenv.mkDerivation { pname = "owl-compositor"; version = "unstable-2021-11-10"; @@ -43,6 +44,7 @@ mkDerivation { darwin.bootstrap_cmds ] ++ lib.optionals (!stdenv.isDarwin) [ gnustep.make + gnustep.wrapGNUstepAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/wayfire/firedecor.nix b/pkgs/applications/window-managers/wayfire/firedecor.nix new file mode 100644 index 000000000000..ce42f6fc6886 --- /dev/null +++ b/pkgs/applications/window-managers/wayfire/firedecor.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, pkg-config +, boost +, cairo +, glib +, libGL +, libinput +, librsvg +, libxkbcommon +, pango +, udev +, wayfire +, wayland +, wf-config +, xcbutilwm +, mate +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "firedecor"; + version = "2023-10-23"; + + src = fetchFromGitHub { + owner = "mntmn"; + repo = "Firedecor"; + rev = finalAttrs.version; + hash = "sha256-7or8HkmIZnLpXEZzUhJ3u8SIPfIQFgn32Ju/5OzK06Y="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + boost + cairo + glib + libGL + libinput + librsvg + libxkbcommon + pango + udev + wayfire + wayland + wf-config + xcbutilwm + ]; + + postPatch = '' + substituteInPlace src/firedecor-theme.cpp \ + --replace-fail "/usr/share" "/run/current-system/sw/share" + ''; + + env = { + PKG_CONFIG_WAYFIRE_PLUGINDIR = "${placeholder "out"}/lib/wayfire"; + PKG_CONFIG_WAYFIRE_METADATADIR = "${placeholder "out"}/share/wayfire/metadata"; + }; + + meta = with lib; { + homepage = "https://github.com/mntmn/Firedecor"; + description = "Advanced window decoration plugin for the Wayfire window manager"; + license = licenses.mit; + inherit (mate.mate-wayland-session.meta) maintainers; + inherit (wayfire.meta) platforms; + }; +}) diff --git a/pkgs/applications/window-managers/wayfire/plugins.nix b/pkgs/applications/window-managers/wayfire/plugins.nix index 86f522cdd68d..b8af85aafd0d 100644 --- a/pkgs/applications/window-managers/wayfire/plugins.nix +++ b/pkgs/applications/window-managers/wayfire/plugins.nix @@ -4,6 +4,7 @@ lib.makeScope pkgs.newScope (self: let inherit (self) callPackage; in { + firedecor = callPackage ./firedecor.nix { }; wayfire-plugins-extra = callPackage ./wayfire-plugins-extra.nix { }; wcm = callPackage ./wcm.nix { }; wf-shell = callPackage ./wf-shell.nix { }; diff --git a/pkgs/applications/window-managers/wayfire/wf-shell.nix b/pkgs/applications/window-managers/wayfire/wf-shell.nix index 229a87234924..b71e667b31ad 100644 --- a/pkgs/applications/window-managers/wayfire/wf-shell.nix +++ b/pkgs/applications/window-managers/wayfire/wf-shell.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wf-shell"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "WayfireWM"; repo = "wf-shell"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-K5g9DfFlqZyPHDUswx3vtzh0D9ogOQ1p87ZrqyH35vs="; + hash = "sha256-/ajFPIk8VJnlu2DzvSyGD3bC4r/pxALTkZeLNvs9dTw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 34532411888c..b4472425324e 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo="; }; + postPatch = '' + # raise neatvnc version bound to 0.8.0 + # https://gitlab.freedesktop.org/wayland/weston/-/issues/890 + substituteInPlace libweston/backend-vnc/meson.build \ + --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '<= 0.8.0']" + ''; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ |