From bad80f68410e0aa2c2be99c37c119c83b043ddc6 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 7 Oct 2024 04:28:21 +0800 Subject: [PATCH] emacsPackages.alectryon: 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 927b2e4ee511..dfd99077e9fe 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -757,15 +757,20 @@ let # https://github.com/gongo/airplay-el/issues/2 airplay = addPackageRequires super.airplay [ self.request-deferred ]; - # https://github.com/melpa/melpa/pull/9185 - alectryon = super.alectryon.overrideAttrs (old: { - preBuild = - old.preBuild or "" - + "\n" - + '' - rm --recursive --verbose etc/elisp/screenshot - ''; - }); + alectryon = super.alectryon.overrideAttrs ( + finalAttrs: previousAttrs: { + # https://github.com/melpa/melpa/pull/9185 + preBuild = + if lib.versionOlder finalAttrs.version "20241006.1902" then + previousAttrs.preBuild or "" + + "\n" + + '' + rm --recursive --verbose etc/elisp/screenshot + '' + else + previousAttrs.preBuild or null; + } + ); # https://github.com/gergelypolonkai/alert-termux/issues/2 alert-termux = addPackageRequires super.alert-termux [ self.alert ];