From aae95f64662c70f9fa4c7bcf9809dc6953db3bcc Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:11:51 +0800 Subject: [PATCH 1/6] emacsPackages.ada-mode: respect old nativeBuildInputs and buildInputs --- .../editors/emacs/elisp-packages/elpa-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ]; From 4810747bb97c35b6c74686a419695d8b8cd319c6 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:13:39 +0800 Subject: [PATCH 2/6] emacsPackages.telega: respect old nativeBuildInputs Fixes https://hydra.nixos.org/build/269115773 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 25dd378f03f6..0a2e620c1833 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -545,7 +545,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 \ From f56dd545bb2ce3ae2234ec7c4e9b049e0b0687ce Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:14:19 +0800 Subject: [PATCH 3/6] emacsPackages.zmq: respect old nativeBuildInputs Fixes https://hydra.nixos.org/build/268777545 --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 0a2e620c1833..871402905ee5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -601,7 +601,7 @@ let export EZMQ_LIBDIR=$(mktemp -d) make ''; - nativeBuildInputs = [ + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoconf pkgs.automake pkgs.pkg-config From dda19805c2ece3d2f9b487c39dc21456f4f7e9e9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:15:17 +0800 Subject: [PATCH 4/6] emacsPackages.vterm: respect old nativeBuildInputs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 871402905ee5..8f5f1dc45a26 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -687,7 +687,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}" From 3eea10fdb7b1a8f925cd167defdf059e5cc371eb Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:17:49 +0800 Subject: [PATCH 5/6] emacsPackages.irony: respect old nativeBuildInputs and buildInputs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 8f5f1dc45a26..3c697763a5ff 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -322,8 +322,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 self.emacs ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; }); # tries to write a log file to $HOME From 1717bb5e36eedb28c4e36749b1cb24926c935a2b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sun, 18 Aug 2024 05:18:15 +0800 Subject: [PATCH 6/6] emacsPackages.irony: remove unneeded emacs --- .../editors/emacs/elisp-packages/melpa-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 3c697763a5ff..42234dd93c0a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -321,8 +321,7 @@ let ''; dontUseCmakeBuildDir = true; doCheck = pkgs.stdenv.isLinux; - packageRequires = [ self.emacs ]; - buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang self.emacs ]; + buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ]; });