From be406552d6d46b5619eefe6f006b3647747e1a3c Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Tue, 30 Sep 2025 18:30:43 +0800
Subject: [PATCH] emacsPackages.cask: improve patch substitution

- use --replace-fail to fail fast
- use shell variable melpaVersion to avoid a string interperation
- use shell variable ename to be consistent with other code and to
  avoid hardcoding
---
 .../emacs/elisp-packages/manual-packages/cask/package.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix
index 5cc1b63a38ba..27a93c3fb898 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix
@@ -74,10 +74,10 @@ melpaBuild (
       shut-up
     ];
 
-    # use melpaVersion so that it works for unstable releases too
     postPatch = ''
-      lispdir=$out/share/emacs/site-lisp/elpa/cask-${finalAttrs.melpaVersion} \
-        substituteAllInPlace bin/cask
+      # use melpaVersion so that it works for unstable releases too
+      substituteInPlace bin/cask \
+        --replace-fail @lispdir@ $out/share/emacs/site-lisp/elpa/$ename-$melpaVersion
     '';
 
     postInstall = ''