about summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2019-07-25 09:23:01 +0000
committerOrivej Desh <orivej@gmx.fr>2019-07-25 09:23:21 +0000
commit32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b (patch)
treefcc3746d350ac20ff693adb7c40f945274e4d2f6 /pkgs/applications/editors
parentaabb651b23969ea4c901914db6ca34eb2897f7a0 (diff)
parentb5d1d50aa90e0780c57fb4b323203ea5056be857 (diff)
Merge master into staging
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/emacs-modes/melpa-packages.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index a401bbc0be1bf..97681afbe15ec 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -59,6 +59,10 @@ self:
         inherit (self.melpaPackages) easy-kill;
       };
 
+      editorconfig = super.editorconfig.overrideAttrs (attrs: {
+        propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
+      });
+
       egg = super.egg.overrideAttrs (attrs: {
         # searches for Git at build time
         nativeBuildInputs =