diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 8bffb346dedd..3a1a5c97a94f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -72,14 +72,14 @@ self: let sourceRoot = "ada-mode-${self.ada-mode.version}"; - nativeBuildInputs = [ + nativeBuildInputs = old.nativeBuildInputs ++ [ buildPackages.gnat buildPackages.gprbuild buildPackages.dos2unix buildPackages.re2c ]; - buildInputs = [ + buildInputs = old.buildInputs ++ [ pkgs.gnatPackages.gnatcoll-xref ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 51d554992558..e073852ba451 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -321,9 +321,8 @@ let ''; dontUseCmakeBuildDir = true; doCheck = pkgs.stdenv.isLinux; - packageRequires = [ self.emacs ]; - buildInputs = [ pkgs.llvmPackages.libclang self.emacs ]; - nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm ]; + buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; }); # tries to write a log file to $HOME @@ -545,7 +544,7 @@ let # Telega has a server portion for it's network protocol telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; - nativeBuildInputs = [ pkgs.pkg-config ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; postPatch = '' substituteInPlace telega-customize.el \ @@ -601,7 +600,7 @@ let export EZMQ_LIBDIR=$(mktemp -d) make ''; - nativeBuildInputs = [ + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoconf pkgs.automake pkgs.pkg-config @@ -687,7 +686,7 @@ let }; vterm = super.vterm.overrideAttrs (old: { - nativeBuildInputs = [ pkgs.cmake ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ]; buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}"