diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-10-17 12:05:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-17 12:05:10 +0800 |
| commit | 4a5c5b7c3141ba7e0d04a9c0e1a581ad548910bc (patch) | |
| tree | a270dac1f380a3668bfafb8bc62ae175e11fcbb7 /pkgs/applications | |
| parent | 9a3e4186644da4029c47335db4fd1b89e7b88880 (diff) | |
| parent | bd0aa43571d329c5b5f2703affdf185e3b6bbeb1 (diff) | |
| download | nixlib-4a5c5b7c3141ba7e0d04a9c0e1a581ad548910bc.tar nixlib-4a5c5b7c3141ba7e0d04a9c0e1a581ad548910bc.tar.gz nixlib-4a5c5b7c3141ba7e0d04a9c0e1a581ad548910bc.tar.bz2 nixlib-4a5c5b7c3141ba7e0d04a9c0e1a581ad548910bc.tar.lz nixlib-4a5c5b7c3141ba7e0d04a9c0e1a581ad548910bc.tar.xz nixlib-4a5c5b7c3141ba7e0d04a9c0e1a581ad548910bc.tar.zst nixlib-4a5c5b7c3141ba7e0d04a9c0e1a581ad548910bc.zip | |
Merge pull request #48575 from bnikolic/magit-filenotify-fix
magit-filenotify: Fix missing dependency on git
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix | 6 |
2 files changed, 12 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; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 98927cbd9873..6d1a8f081e5a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -157,6 +157,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; |