diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix index 4fab49544113..cf85b9ea06a8 100644 --- a/pkgs/applications/window-managers/waybox/default.nix +++ b/pkgs/applications/window-managers/waybox/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , meson +, cmake , ninja , libxkbcommon , wayland @@ -12,29 +13,34 @@ , pixman , udev , libGL +, libxml2 , mesa }: stdenv.mkDerivation rec { pname = "waybox"; - version = "unstable-2021-04-07"; + version = "0.2.0"; src = fetchFromGitHub { owner = "wizbright"; repo = pname; - rev = "309ccd2faf08079e698104b19eff32b3a255b947"; - hash = "sha256-G32cGmOwmnuVlj1hCq9NRti6plJbkAktfzM4aYzQ+k8="; + rev = version; + hash = "sha256-G8dRa4hgev3x58uqp5To5OzF3zcPSuT3NL9MPnWf2M8="; }; nativeBuildInputs = [ pkg-config meson + cmake ninja wayland-scanner ]; + dontUseCmakeConfigure = true; + buildInputs = [ libxkbcommon + libxml2 wayland wayland-protocols wlroots @@ -44,6 +50,8 @@ stdenv.mkDerivation rec { mesa # for libEGL ]; + passthru.providedSessions = [ "waybox" ]; + meta = with lib; { homepage = "https://github.com/wizbright/waybox"; description = "An openbox clone on Wayland"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7df5f2a10c4c..9fbb00281dff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30686,9 +30686,7 @@ with pkgs; i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; - waybox = callPackage ../applications/window-managers/waybox { - wlroots = wlroots_0_14; - }; + waybox = callPackage ../applications/window-managers/waybox { }; workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { };