diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 08:36:28 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-17 08:36:28 +0200 |
| commit | 89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e (patch) | |
| tree | a6d9edb3c73ada52a6207e8a5ad2d32cad77600c /pkgs/applications/editors/emacs-modes/melpa-packages.nix | |
| parent | 7b2ed00ef62476080fe439ce91219376ab8c8a2e (diff) | |
| parent | 18fcc337affa09238a42e9a0ca21e08363c65eeb (diff) | |
| download | nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.gz nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.bz2 nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.lz nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.xz nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.tar.zst nixlib-89349fdae9ddf1ee00ccf4f6094b3c8b7b75694e.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/melpa-packages.nix')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 777d8e62541d..b95a944e612b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -167,6 +167,12 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; |