From dc56ec16cd0900131279a62c5d7b335d6cd1f752 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Fri, 11 Aug 2023 16:17:01 +0200 Subject: [PATCH] rofi-rbw: 1.1.0 -> 1.2.0 Co-authored-by: Bruno BELANYI Co-authored-by: Anderson Torres --- pkgs/applications/misc/rofi-rbw/default.nix | 47 +++++++++++++++++++-- pkgs/top-level/all-packages.nix | 13 +++++- 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix index 0aac8045023c..337cd54d5c23 100644 --- a/pkgs/applications/misc/rofi-rbw/default.nix +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -1,15 +1,30 @@ -{ lib, buildPythonApplication, fetchFromGitHub, configargparse, setuptools, poetry-core, rbw }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, configargparse +, setuptools +, poetry-core +, rbw + +, waylandSupport ? false +, wl-clipboard +, wtype + +, x11Support ? false +, xclip +, xdotool +}: buildPythonApplication rec { pname = "rofi-rbw"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofi-rbw"; rev = "refs/tags/${version}"; - hash = "sha256-5K6tofC1bIxxNOQ0jk6NbVoaGGyQImYiUZAaAmkwiTA="; + hash = "sha256-6ZM+qJvVny/h5W/+7JqD/CCf9eayExvZfC/z9rHssVU="; }; nativeBuildInputs = [ @@ -17,12 +32,36 @@ buildPythonApplication rec { poetry-core ]; + buildInputs = [ + rbw + ] ++ lib.optionals waylandSupport [ + wl-clipboard + wtype + ] ++ lib.optionals x11Support [ + xclip + xdotool + ]; + propagatedBuildInputs = [ configargparse ]; pythonImportsCheck = [ "rofi_rbw" ]; + wrapper_paths = [ + rbw + ] ++ lib.optionals waylandSupport [ + wl-clipboard + wtype + ] ++ lib.optionals x11Support [ + xclip + xdotool + ]; + + wrapper_flags = + lib.optionalString waylandSupport "--typer wtype --clipboarder wl-copy" + + lib.optionalString x11Support "--typer xdotool --clipboarder xclip"; + preFixup = '' - makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ rbw ]}) + makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath wrapper_paths} --add-flags "${wrapper_flags}") ''; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6388f139a201..b3d03c8cbb87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33783,7 +33783,18 @@ with pkgs; rofi-pulse-select = callPackage ../applications/audio/rofi-pulse-select { }; - rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { }; + 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; + }; rofi-screenshot = callPackage ../applications/misc/rofi-screenshot { };