diff --git a/pkgs/by-name/ro/rofi-rbw-wayland/package.nix b/pkgs/by-name/ro/rofi-rbw-wayland/package.nix new file mode 100644 index 000000000000..df14e2c5f67c --- /dev/null +++ b/pkgs/by-name/ro/rofi-rbw-wayland/package.nix @@ -0,0 +1,4 @@ +{ rofi-rbw }: +rofi-rbw.override { + waylandSupport = true; +} diff --git a/pkgs/by-name/ro/rofi-rbw-x11/package.nix b/pkgs/by-name/ro/rofi-rbw-x11/package.nix new file mode 100644 index 000000000000..80ef776daa51 --- /dev/null +++ b/pkgs/by-name/ro/rofi-rbw-x11/package.nix @@ -0,0 +1,4 @@ +{ rofi-rbw }: +rofi-rbw.override { + x11Support = true; +} diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/by-name/ro/rofi-rbw/package.nix similarity index 89% rename from pkgs/applications/misc/rofi-rbw/default.nix rename to pkgs/by-name/ro/rofi-rbw/package.nix index 13f9e91244e5..54b65be783fe 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/by-name/ro/rofi-rbw/package.nix @@ -1,9 +1,7 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - configargparse, - hatchling, rbw, waylandSupport ? false, @@ -15,7 +13,7 @@ xdotool, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "rofi-rbw"; version = "1.5.1"; format = "pyproject"; @@ -28,7 +26,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - hatchling + python3Packages.hatchling ]; buildInputs = [ @@ -43,7 +41,9 @@ buildPythonApplication rec { xdotool ]; - propagatedBuildInputs = [ configargparse ]; + propagatedBuildInputs = [ + python3Packages.configargparse + ]; pythonImportsCheck = [ "rofi_rbw" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b48eb8809a3..4e0df15c2457 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11839,19 +11839,6 @@ with pkgs; rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3; - rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { - waylandSupport = false; - x11Support = false; - }; - - rofi-rbw-wayland = python3Packages.callPackage ../applications/misc/rofi-rbw { - waylandSupport = true; - }; - - rofi-rbw-x11 = python3Packages.callPackage ../applications/misc/rofi-rbw { - x11Support = true; - }; - # a somewhat more maintained fork of ympd memento = qt6Packages.callPackage ../applications/video/memento { };