lol

Merge pull request #221729 from JohnJohnstone/master

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

authored by

Aleksana and committed by
GitHub
9217de29 ffb9257c

+112
+6
maintainers/maintainer-list.nix
··· 9836 9836 githubId = 32305209; 9837 9837 name = "John Children"; 9838 9838 }; 9839 + johnjohnstone = { 9840 + email = "jjohnstone@riseup.net"; 9841 + github = "johnjohnstone"; 9842 + githubId = 3208498; 9843 + name = "John Johnstone"; 9844 + }; 9839 9845 johnmh = { 9840 9846 email = "johnmh@openblox.org"; 9841 9847 github = "JohnMH";
+25
pkgs/by-name/ro/rofi-blezz/0001-Patch-plugindir-to-output.patch
··· 1 + From 7f5a652150aef9c098d2d5d4bc4f6d497609c47c Mon Sep 17 00:00:00 2001 2 + From: john johnstone <jjohnstone@riseup.net> 3 + Date: Sat, 11 Mar 2023 22:29:18 +0000 4 + Subject: [PATCH] plugin install dir patch for nix 5 + 6 + --- 7 + configure.ac | 2 +- 8 + 1 file changed, 1 insertion(+), 1 deletion(-) 9 + 10 + diff --git a/configure.ac b/configure.ac 11 + index 31d96d0..a7a589d 100644 12 + --- a/configure.ac 13 + +++ b/configure.ac 14 + @@ -54,7 +54,7 @@ dnl --------------------------------------------------------------------- 15 + PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0]) 16 + PKG_CHECK_MODULES([rofi], [rofi]) 17 + 18 + -[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`" 19 + +[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`" 20 + AC_SUBST([rofi_PLUGIN_INSTALL_DIR]) 21 + 22 + LT_INIT([disable-static]) 23 + -- 24 + 2.39.2 25 +
+38
pkgs/by-name/ro/rofi-blezz/0002-Patch-add-cairo.patch
··· 1 + From ed8943fdd9ffe7d53a89b7cd18a08165708884ad Mon Sep 17 00:00:00 2001 2 + From: john johnstone <jjohnstone@riseup.net> 3 + Date: Sun, 12 Mar 2023 04:41:44 +0000 4 + Subject: [PATCH] patch cairo 5 + 6 + --- 7 + Makefile.am | 4 ++-- 8 + configure.ac | 1 + 9 + 2 files changed, 3 insertions(+), 2 deletions(-) 10 + 11 + diff --git a/Makefile.am b/Makefile.am 12 + index cef4046..ba7051a 100644 13 + --- a/Makefile.am 14 + +++ b/Makefile.am 15 + @@ -6,6 +6,6 @@ plugin_LTLIBRARIES = blezz.la 16 + blezz_la_SOURCES=\ 17 + src/blezz.c 18 + 19 + -blezz_la_CFLAGS= @glib_CFLAGS@ @rofi_CFLAGS@ 20 + -blezz_la_LIBADD= @glib_LIBS@ @rofi_LIBS@ 21 + +blezz_la_CFLAGS= @glib_CFLAGS@ @rofi_CFLAGS@ @cairo_CFLAGS@ 22 + +blezz_la_LIBADD= @glib_LIBS@ @rofi_LIBS@ @cairo_LIBS@ 23 + blezz_la_LDFLAGS= -module -avoid-version 24 + diff --git a/configure.ac b/configure.ac 25 + index a7a589d..ce4e649 100644 26 + --- a/configure.ac 27 + +++ b/configure.ac 28 + @@ -53,6 +53,7 @@ dnl PKG_CONFIG based dependencies 29 + dnl --------------------------------------------------------------------- 30 + PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0]) 31 + PKG_CHECK_MODULES([rofi], [rofi]) 32 + +PKG_CHECK_MODULES([cairo], [cairo cairo-xcb]) 33 + 34 + [rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`" 35 + AC_SUBST([rofi_PLUGIN_INSTALL_DIR]) 36 + -- 37 + 2.39.2 38 +
+43
pkgs/by-name/ro/rofi-blezz/package.nix
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , autoreconfHook 5 + , cairo 6 + , pkg-config 7 + , rofi-unwrapped 8 + }: 9 + 10 + stdenv.mkDerivation { 11 + pname = "rofi-blezz"; 12 + version = "2023-03-27"; 13 + 14 + src = fetchFromGitHub { 15 + owner = "davatorium"; 16 + repo = "rofi-blezz"; 17 + rev = "3a00473471e7c56d2c349ad437937107b7d8e961"; 18 + sha256 = "sha256-hY5UA7nyL6QoOBIZTjEiR0zjZFhkUkRa50r5rVZDnbg="; 19 + }; 20 + 21 + patches = [ 22 + ./0001-Patch-plugindir-to-output.patch 23 + ./0002-Patch-add-cairo.patch 24 + ]; 25 + 26 + nativeBuildInputs = [ 27 + autoreconfHook 28 + pkg-config 29 + ]; 30 + 31 + buildInputs = [ 32 + cairo 33 + rofi-unwrapped 34 + ]; 35 + 36 + meta = with lib; { 37 + description = "A plugin for rofi that emulates blezz behaviour"; 38 + homepage = "https://github.com/davatorium/rofi-blezz"; 39 + license = licenses.mit; 40 + maintainers = with maintainers; [ johnjohnstone ]; 41 + platforms = platforms.linux; 42 + }; 43 + }