dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #335467 from linj-fork/pr/respect-nativeBuildInputs

Browse Source 
emacsPackages: respect old nativeBuildInputs and buildInputs when overridding
This commit is contained in:
adisbladis 2024-08-18 16:33:03 +12:00 committed by GitHub
commit 61c7668d5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
View File

@ -72,14 +72,14 @@ self: let
sourceRoot = "ada-mode-${self.ada-mode.version}"; sourceRoot = "ada-mode-${self.ada-mode.version}";
nativeBuildInputs = [ nativeBuildInputs = old.nativeBuildInputs ++ [
buildPackages.gnat buildPackages.gnat
buildPackages.gprbuild buildPackages.gprbuild
buildPackages.dos2unix buildPackages.dos2unix
buildPackages.re2c buildPackages.re2c
]; ];
buildInputs = [ buildInputs = old.buildInputs ++ [
pkgs.gnatPackages.gnatcoll-xref pkgs.gnatPackages.gnatcoll-xref
]; ];

11
pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
View File

@ -321,9 +321,8 @@ let
''; '';
dontUseCmakeBuildDir = true; dontUseCmakeBuildDir = true;
doCheck = pkgs.stdenv.isLinux; doCheck = pkgs.stdenv.isLinux;
packageRequires = [ self.emacs ]; buildInputs = old.buildInputs ++ [ pkgs.llvmPackages.libclang ];
buildInputs = [ pkgs.llvmPackages.libclang self.emacs ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.llvmPackages.llvm ];
nativeBuildInputs = [ pkgs.cmake pkgs.llvmPackages.llvm ];
}); });
# tries to write a log file to $HOME # tries to write a log file to $HOME
@ -545,7 +544,7 @@ let
# Telega has a server portion for it's network protocol # Telega has a server portion for it's network protocol
telega = super.telega.overrideAttrs (old: { telega = super.telega.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; buildInputs = old.buildInputs ++ [ pkgs.tdlib ];
nativeBuildInputs = [ pkgs.pkg-config ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
postPatch = '' postPatch = ''
substituteInPlace telega-customize.el \ substituteInPlace telega-customize.el \
@ -601,7 +600,7 @@ let
export EZMQ_LIBDIR=$(mktemp -d) export EZMQ_LIBDIR=$(mktemp -d)
make make
''; '';
nativeBuildInputs = [ nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.autoconf pkgs.autoconf
pkgs.automake pkgs.automake
pkgs.pkg-config pkgs.pkg-config
@ -687,7 +686,7 @@ let
}; };
vterm = super.vterm.overrideAttrs (old: { vterm = super.vterm.overrideAttrs (old: {
nativeBuildInputs = [ pkgs.cmake ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ];
buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ]; buildInputs = old.buildInputs ++ [ self.emacs pkgs.libvterm-neovim ];
cmakeFlags = [ cmakeFlags = [
"-DEMACS_SOURCE=${self.emacs.src}" "-DEMACS_SOURCE=${self.emacs.src}"