public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65352 from ttuegel/emacs/editorconfig

Browse Source 
editorconfig: Include runtime dependency on editorconfig-core-c
This commit is contained in:
Thomas Tuegel 2019-07-24 16:08:01 -05:00 committed by GitHub
commit 897b1af5d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -59,6 +59,10 @@ self:
inherit (self.melpaPackages) easy-kill; inherit (self.melpaPackages) easy-kill;
}; };
editorconfig = super.editorconfig.overrideAttrs (attrs: {
propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
});
egg = super.egg.overrideAttrs (attrs: { egg = super.egg.overrideAttrs (attrs: {
# searches for Git at build time # searches for Git at build time
nativeBuildInputs = nativeBuildInputs =

8
pkgs/top-level/all-packages.nix
View File

@ -17818,11 +17818,13 @@ in
}; };
external = { external = {
inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; inherit (haskellPackages)
ghc-mod structured-haskell-mode Agda hindent;
inherit (pythonPackages) elpy; inherit (pythonPackages) elpy;
inherit inherit
autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib autoconf automake editorconfig-core-c git libffi libpng pkgconfig
substituteAll rustPlatform cmake llvmPackages libtool zeromq; poppler rtags w3m zlib substituteAll rustPlatform cmake llvmPackages
libtool zeromq;
}; };
}; };