Merge pull request #221729 from JohnJohnstone/master

rofi-blezz: init at unstable-2022-09-07

4 files changed, 112 insertions, 0 deletions

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0dec47beb86a..1409fb743964 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9836,6 +9836,12 @@
     githubId = 32305209;
     name = "John Children";
   };
+  johnjohnstone = {
+   email = "jjohnstone@riseup.net";
+   github = "johnjohnstone";
+   githubId = 3208498;
+   name = "John Johnstone";
+  };
   johnmh = {
     email = "johnmh@openblox.org";
     github = "JohnMH";
diff --git a/pkgs/by-name/ro/rofi-blezz/0001-Patch-plugindir-to-output.patch b/pkgs/by-name/ro/rofi-blezz/0001-Patch-plugindir-to-output.patch
new file mode 100644
index 000000000000..711cbc63b244
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-blezz/0001-Patch-plugindir-to-output.patch
@@ -0,0 +1,25 @@
+From 7f5a652150aef9c098d2d5d4bc4f6d497609c47c Mon Sep 17 00:00:00 2001
+From: john johnstone <jjohnstone@riseup.net>
+Date: Sat, 11 Mar 2023 22:29:18 +0000
+Subject: [PATCH] plugin install dir patch for nix
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 31d96d0..a7a589d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ dnl ---------------------------------------------------------------------
+ PKG_CHECK_MODULES([glib],     [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0])
+ PKG_CHECK_MODULES([rofi],     [rofi])
+ 
+-[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`"
++[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`"
+ AC_SUBST([rofi_PLUGIN_INSTALL_DIR])
+ 
+ LT_INIT([disable-static])
+-- 
+2.39.2
+
diff --git a/pkgs/by-name/ro/rofi-blezz/0002-Patch-add-cairo.patch b/pkgs/by-name/ro/rofi-blezz/0002-Patch-add-cairo.patch
new file mode 100644
index 000000000000..f1051cb82c4e
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-blezz/0002-Patch-add-cairo.patch
@@ -0,0 +1,38 @@
+From ed8943fdd9ffe7d53a89b7cd18a08165708884ad Mon Sep 17 00:00:00 2001
+From: john johnstone <jjohnstone@riseup.net>
+Date: Sun, 12 Mar 2023 04:41:44 +0000
+Subject: [PATCH] patch cairo
+
+---
+ Makefile.am  | 4 ++--
+ configure.ac | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cef4046..ba7051a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,6 +6,6 @@ plugin_LTLIBRARIES = blezz.la
+ blezz_la_SOURCES=\
+ 		 src/blezz.c
+ 
+-blezz_la_CFLAGS= @glib_CFLAGS@ @rofi_CFLAGS@
+-blezz_la_LIBADD= @glib_LIBS@ @rofi_LIBS@
++blezz_la_CFLAGS= @glib_CFLAGS@ @rofi_CFLAGS@ @cairo_CFLAGS@
++blezz_la_LIBADD= @glib_LIBS@ @rofi_LIBS@ @cairo_LIBS@
+ blezz_la_LDFLAGS= -module -avoid-version
+diff --git a/configure.ac b/configure.ac
+index a7a589d..ce4e649 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,6 +53,7 @@ dnl PKG_CONFIG based dependencies
+ dnl ---------------------------------------------------------------------
+ PKG_CHECK_MODULES([glib],     [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0])
+ PKG_CHECK_MODULES([rofi],     [rofi])
++PKG_CHECK_MODULES([cairo],    [cairo cairo-xcb])
+ 
+ [rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`"
+ AC_SUBST([rofi_PLUGIN_INSTALL_DIR])
+-- 
+2.39.2
+
diff --git a/pkgs/by-name/ro/rofi-blezz/package.nix b/pkgs/by-name/ro/rofi-blezz/package.nix
new file mode 100644
index 000000000000..0b6f0b2bdc2f
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-blezz/package.nix
@@ -0,0 +1,43 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, cairo
+, pkg-config
+, rofi-unwrapped
+}:
+
+stdenv.mkDerivation {
+  pname = "rofi-blezz";
+  version = "2023-03-27";
+
+  src = fetchFromGitHub {
+    owner = "davatorium";
+    repo = "rofi-blezz";
+    rev = "3a00473471e7c56d2c349ad437937107b7d8e961";
+    sha256 = "sha256-hY5UA7nyL6QoOBIZTjEiR0zjZFhkUkRa50r5rVZDnbg=";
+  };
+
+  patches = [
+    ./0001-Patch-plugindir-to-output.patch
+    ./0002-Patch-add-cairo.patch
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    cairo
+    rofi-unwrapped
+  ];
+
+  meta = with lib; {
+    description = "A plugin for rofi that emulates blezz behaviour";
+    homepage = "https://github.com/davatorium/rofi-blezz";
+    license = licenses.mit;
+    maintainers = with maintainers; [ johnjohnstone ];
+    platforms = platforms.linux;
+  };
+}