waybox: unstable-2021-04-07 -> 0.2.0

wineee · wineee · commit 47d453b770cd · 2023-03-09T13:51:51.000+08:00
diff --git 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
@@ -30633,9 +30633,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 { };
 
