From 882fac471737df700a6fe01d7d9b223c03376be9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 10 Feb 2025 12:44:59 +0800 Subject: [PATCH] emacsPackages.dap-mode: fix build https://hydra.nix-community.org/build/2991612 (cherry picked from commit fe5312cd441714a518c3585297ba0f1915e899b8) This was originally committed to the staging-next branch. To make it reach users sooner, we revert it on the staging-next branch and reapply it to the master branch. Closes: https://github.com/nix-community/emacs-overlay/issues/467 --- .../emacs/elisp-packages/melpa-packages.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 122a02f18abd..dbbbe8df53b1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -977,14 +977,19 @@ let cssh = ignoreCompilationError super.cssh; # elisp error - dap-mode = super.dap-mode.overrideAttrs (old: { - # empty file causing native-compiler-error-empty-byte - preBuild = - '' - rm --verbose dapui.el - '' - + old.preBuild or ""; - }); + dap-mode = super.dap-mode.overrideAttrs ( + finalAttrs: previousAttrs: { + # empty file causing native-compiler-error-empty-byte + preBuild = + if lib.versionOlder finalAttrs.version "20250131.1624" then + '' + rm --verbose dapui.el + '' + + previousAttrs.preBuild or "" + else + previousAttrs.preBuild or null; + } + ); db-pg = ignoreCompilationError super.db-pg; # elisp error