From 2f63405c2e11a54fc99e80c3635c6014c2118e23 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 15 Sep 2024 04:01:41 +0800
Subject: [PATCH] emacs.pkgs.elpaPackages.plz: move to common overrides

---
 .../elisp-packages/elpa-common-overrides.nix   | 18 ++++++++++++++++++
 .../emacs/elisp-packages/elpa-packages.nix     | 14 --------------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
index 2ecdf453abaf..a181f85ed61c 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
@@ -97,6 +97,24 @@ in
     };
   });
 
+  plz = super.plz.overrideAttrs (old: {
+    dontUnpack = false;
+    postPatch =
+      old.postPatch or ""
+      + "\n"
+      + ''
+        substituteInPlace plz.el \
+          --replace-fail 'plz-curl-program "curl"' 'plz-curl-program "${lib.getExe pkgs.curl}"'
+      '';
+    preInstall =
+      old.preInstall or ""
+      + "\n"
+      + ''
+        tar -cf "$ename-$version.tar" --transform "s,^,$ename-$version/," * .[!.]*
+        src="$ename-$version.tar"
+      '';
+  });
+
   pq = super.pq.overrideAttrs (old: {
     buildInputs = old.buildInputs or [ ] ++ [ pkgs.postgresql ];
   });
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index a122211031b9..283c762bd2ae 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
@@ -57,20 +57,6 @@ self: let
         else super.org-transclusion;
       rcirc-menu = markBroken super.rcirc-menu; # Missing file header
 
-      plz = super.plz.overrideAttrs (
-        old: {
-          dontUnpack = false;
-          postPatch = old.postPatch or "" + ''
-            substituteInPlace ./plz.el \
-              --replace 'plz-curl-program "curl"' 'plz-curl-program "${pkgs.curl}/bin/curl"'
-          '';
-          preInstall = ''
-            tar -cf "$pname-$version.tar" --transform "s,^,$pname-$version/," * .[!.]*
-            src="$pname-$version.tar"
-          '';
-        }
-      );
-
 
     };