rofi-calc: init at 1.6 (#83136)

Also:
* maintainers: add albakhamj
* maintainers: add luc65r
* rofi: add plugins argument to wrapper

Co-authored-by: Maciej Krüger <mkg20001@gmail.com>

authored by luc65r Maciej Krüger and committed by GitHub 8edd400b 40fab12b

+104 -9
+12
maintainers/maintainer-list.nix
··· 302 302 githubId = 786394; 303 303 name = "Alexander Krupenkin "; 304 304 }; 305 + albakham = { 306 + email = "dev@geber.ga"; 307 + github = "albakham"; 308 + githubId = 43479487; 309 + name = "Titouan Biteau"; 310 + }; 305 311 alexarice = { 306 312 email = "alexrice999@hotmail.co.uk"; 307 313 github = "alexarice"; ··· 4397 4403 email = "laure.tavard@univ-grenoble-alpes.fr"; 4398 4404 github = "ltavard"; 4399 4405 name = "Laure Tavard"; 4406 + }; 4407 + luc65r = { 4408 + email = "lucas@ransan.tk"; 4409 + github = "luc65r"; 4410 + githubId = 59375051; 4411 + name = "Lucas Ransan"; 4400 4412 }; 4401 4413 lucus16 = { 4402 4414 email = "lars.jellema@gmail.com";
+11 -9
pkgs/applications/misc/rofi/wrapper.nix
··· 1 - { stdenv, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null }: 1 + { symlinkJoin, lib, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null, plugins ? [] }: 2 2 3 - stdenv.mkDerivation { 4 - pname = "rofi"; 5 - version = rofi-unwrapped.version; 3 + symlinkJoin { 4 + name = "rofi-${rofi-unwrapped.version}"; 5 + 6 + paths = [ 7 + rofi-unwrapped.out 8 + ] ++ (lib.forEach plugins (p: p.out)); 6 9 7 10 buildInputs = [ makeWrapper ]; 8 11 preferLocalBuild = true; 9 12 passthru.unwrapped = rofi-unwrapped; 10 - buildCommand = '' 11 - mkdir $out 12 - ln -s ${rofi-unwrapped}/* $out 13 - rm $out/bin 13 + postBuild = '' 14 + rm -rf $out/bin 14 15 mkdir $out/bin 15 16 ln -s ${rofi-unwrapped}/bin/* $out/bin 16 17 17 18 rm $out/bin/rofi 18 19 makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \ 19 20 --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ 20 - ${if theme != null then ''--add-flags "-theme ${theme}"'' else ""} 21 + ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \ 22 + ${lib.optionalString (plugins != []) ''--add-flags "-plugin-path $out/lib/rofi"''} 21 23 22 24 rm $out/bin/rofi-theme-selector 23 25 makeWrapper ${rofi-unwrapped}/bin/rofi-theme-selector $out/bin/rofi-theme-selector \
+25
pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch
··· 1 + From 0eaef67b683683fb423fcb2d5096b3cdf9a4a9cd Mon Sep 17 00:00:00 2001 2 + From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com> 3 + Date: Sun, 22 Mar 2020 12:26:10 +0100 4 + Subject: [PATCH] Patch plugindir to output 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 50edb74..639ee86 100644 12 + --- a/configure.ac 13 + +++ b/configure.ac 14 + @@ -50,7 +50,7 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 ]) 15 + PKG_CHECK_MODULES([cairo], [cairo]) 16 + PKG_CHECK_MODULES([rofi], [rofi >= 1.5.4]) 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.25.1 25 +
+54
pkgs/applications/science/math/rofi-calc/default.nix
··· 1 + { stdenv 2 + , fetchFromGitHub 3 + , autoreconfHook 4 + , pkgconfig 5 + , rofi-unwrapped 6 + , libqalculate 7 + , glib 8 + , cairo 9 + , gobject-introspection 10 + , wrapGAppsHook 11 + }: 12 + 13 + stdenv.mkDerivation rec { 14 + pname = "rofi-calc"; 15 + version = "1.6"; 16 + 17 + src = fetchFromGitHub { 18 + owner = "svenstaro"; 19 + repo = pname; 20 + rev = "v${version}"; 21 + sha256 = "00pz0s99pihjdjy8pl4ckg2qciyp32k439lmjb5iazwck512ar92"; 22 + }; 23 + 24 + nativeBuildInputs = [ 25 + autoreconfHook 26 + pkgconfig 27 + gobject-introspection 28 + wrapGAppsHook 29 + ]; 30 + 31 + buildInputs = [ 32 + rofi-unwrapped 33 + libqalculate 34 + glib 35 + cairo 36 + ]; 37 + 38 + patches = [ 39 + ./0001-Patch-plugindir-to-output.patch 40 + ]; 41 + 42 + postPatch = '' 43 + sed "s|qalc_binary = \"qalc\"|qalc_binary = \"${libqalculate}/bin/qalc\"|" -i src/calc.c 44 + ''; 45 + 46 + meta = with stdenv.lib; { 47 + description = "Do live calculations in rofi!"; 48 + homepage = "https://github.com/svenstaro/rofi-calc"; 49 + license = licenses.mit; 50 + maintainers = with maintainers; [ luc65r albakham ]; 51 + platforms = [ "x86_64-linux" "x86_64-darwin" ]; 52 + }; 53 + } 54 +
+2
pkgs/top-level/all-packages.nix
··· 20671 20671 20672 20672 rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; 20673 20673 20674 + rofi-calc = callPackage ../applications/science/math/rofi-calc { }; 20675 + 20674 20676 ympd = callPackage ../applications/audio/ympd { }; 20675 20677 20676 20678 nload = callPackage ../applications/networking/nload { };