From 01ea823ea5f63e6cab5602300709aa018f5f6700 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 7 Oct 2024 02:55:53 +0800 Subject: [PATCH] emacsPackages.frontside-javascript: override only when needed --- .../emacs/elisp-packages/melpa-packages.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0973981990e0..927b2e4ee511 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1066,15 +1066,20 @@ let fold-dwim-org = ignoreCompilationError super.fold-dwim-org; # elisp error - # https://github.com/melpa/melpa/pull/9182 - frontside-javascript = super.frontside-javascript.overrideAttrs (old: { - preBuild = - old.preBuild or "" - + "\n" - + '' - rm --verbose packages/javascript/test-suppport.el - ''; - }); + frontside-javascript = super.frontside-javascript.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9182 + preBuild = + if lib.versionOlder finalAttrs.version "20240929.1858" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --verbose packages/javascript/test-suppport.el + '' + else + previousAttrs.preBuild or null; + } + ); fxrd-mode = ignoreCompilationError super.fxrd-mode; # elisp error