From 6a2d3a9b146c6bf471c616257e968e939ea61d2f Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 11 Feb 2025 12:21:54 +0800 Subject: [PATCH] Revert "emacsPackages.dap-mode: fix build" This reverts commit fe5312cd441714a518c3585297ba0f1915e899b8. To make this fix reach users sooner, we revert it on the staging-next branch and reapply it to the master branch. --- .../emacs/elisp-packages/melpa-packages.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 62f476dc5440..d3e294d70b16 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -982,19 +982,14 @@ let cssh = ignoreCompilationError super.cssh; # elisp error - 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; - } - ); + dap-mode = super.dap-mode.overrideAttrs (old: { + # empty file causing native-compiler-error-empty-byte + preBuild = + '' + rm --verbose dapui.el + '' + + old.preBuild or ""; + }); db-pg = ignoreCompilationError super.db-pg; # elisp error