From 84adcaf7ddb88f6e9d5336c28a23149f592ff6dd Mon Sep 17 00:00:00 2001
From: zspher <66728045+zspher@users.noreply.github.com>
Date: Fri, 13 Jun 2025 07:25:23 -0600
Subject: [PATCH 1/2] rofi-calc: 2.3.1 -> 2.3.2

---
 .../0001-Patch-plugindir-to-output.patch      | 25 -------------------
 pkgs/by-name/ro/rofi-calc/package.nix         | 22 +++++++++-------
 2 files changed, 13 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch

diff --git a/pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch b/pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch
deleted file mode 100644
index 197d1347d535c..0000000000000
--- a/pkgs/by-name/ro/rofi-calc/0001-Patch-plugindir-to-output.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0eaef67b683683fb423fcb2d5096b3cdf9a4a9cd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
-Date: Sun, 22 Mar 2020 12:26:10 +0100
-Subject: [PATCH] Patch plugindir to output
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 50edb74..639ee86 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,7 +50,7 @@ PKG_CHECK_MODULES([glib],     [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 ])
- PKG_CHECK_MODULES([cairo],    [cairo])
- PKG_CHECK_MODULES([rofi],     [rofi >= 1.5.4])
- 
--[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.25.1
-
diff --git a/pkgs/by-name/ro/rofi-calc/package.nix b/pkgs/by-name/ro/rofi-calc/package.nix
index 42385c8b909d7..2f4ec18b18ee6 100644
--- a/pkgs/by-name/ro/rofi-calc/package.nix
+++ b/pkgs/by-name/ro/rofi-calc/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  autoreconfHook,
   pkg-config,
   rofi-unwrapped,
   libqalculate,
@@ -10,24 +9,27 @@
   cairo,
   gobject-introspection,
   wrapGAppsHook3,
+  meson,
+  ninja,
 }:
 
 stdenv.mkDerivation rec {
   pname = "rofi-calc";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "rofi-calc";
     rev = "v${version}";
-    sha256 = "sha256-1Sdi7SN5ZhBJB5qyqDZQC5QcBz0Fydb1az8yDSuTlnE=";
+    sha256 = "sha256-ASZtIcUxaOYYAlINa77R9WgqonHtAR7Fdm9wDrbyRy0=";
   };
 
   nativeBuildInputs = [
-    autoreconfHook
     pkg-config
     gobject-introspection
     wrapGAppsHook3
+    meson
+    ninja
   ];
 
   buildInputs = [
@@ -37,12 +39,14 @@ stdenv.mkDerivation rec {
     cairo
   ];
 
-  patches = [
-    ./0001-Patch-plugindir-to-output.patch
-  ];
-
   postPatch = ''
-    sed "s|qalc_binary = \"qalc\"|qalc_binary = \"${libqalculate}/bin/qalc\"|" -i src/calc.c
+    substituteInPlace src/calc.c --replace-fail \
+      "qalc_binary = \"qalc\"" \
+      "qalc_binary = \"${libqalculate}/bin/qalc\""
+
+    substituteInPlace src/meson.build --replace-fail \
+      "rofi.get_variable('pluginsdir')" \
+      "'$out/lib/rofi'"
   '';
 
   meta = with lib; {

From 9e3145ac37bebd94049fdbfdcb5a92798efe491d Mon Sep 17 00:00:00 2001
From: zspher <66728045+zspher@users.noreply.github.com>
Date: Wed, 25 Jun 2025 23:54:33 -0600
Subject: [PATCH 2/2] rofi-calc: set mesonBuildType to release

---
 pkgs/by-name/ro/rofi-calc/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ro/rofi-calc/package.nix b/pkgs/by-name/ro/rofi-calc/package.nix
index 2f4ec18b18ee6..2ba4edfe0d2a2 100644
--- a/pkgs/by-name/ro/rofi-calc/package.nix
+++ b/pkgs/by-name/ro/rofi-calc/package.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     cairo
   ];
 
+  mesonBuildType = "release";
+
   postPatch = ''
     substituteInPlace src/calc.c --replace-fail \
       "qalc_binary = \"qalc\"" \