diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/wayland/wob/default.nix similarity index 87% rename from pkgs/tools/misc/wob/default.nix rename to pkgs/tools/wayland/wob/default.nix index e0622e5416aa..3567ed6eea41 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/wayland/wob/default.nix @@ -1,6 +1,13 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc, wayland # wayland-scanner -, wayland-protocols, libseccomp +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, libseccomp +, wayland # wayland-scanner +, wayland-protocols }: stdenv.mkDerivation rec { @@ -21,15 +28,15 @@ stdenv.mkDerivation rec { mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; meta = with lib; { + inherit (src.meta) homepage; description = "A lightweight overlay bar for Wayland"; longDescription = '' A lightweight overlay volume/backlight/progress/anything bar for Wayland, inspired by xob. ''; - inherit (src.meta) homepage; changelog = "https://github.com/francma/wob/releases/tag/${version}"; license = licenses.isc; - platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0d0df6f9537..649825cbb7aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1976,6 +1976,8 @@ in wlr-randr = callPackage ../tools/wayland/wlr-randr { }; + wob = callPackage ../tools/wayland/wob { }; + clipster = callPackage ../tools/misc/clipster { }; contrast = callPackage ../applications/accessibility/contrast { }; @@ -3864,8 +3866,6 @@ in wlsunset = callPackage ../tools/wayland/wlsunset { }; - wob = callPackage ../tools/misc/wob { }; - wtype = callPackage ../tools/wayland/wtype { }; wrangler = callPackage ../development/tools/wrangler { };