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

Merge pull request #48575 from bnikolic/magit-filenotify-fix

Browse Source 
magit-filenotify: Fix missing dependency on git
This commit is contained in:
Peter Hoeg 2018-10-17 12:05:10 +08:00 committed by GitHub
commit 4a5c5b7c31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,6 +167,12 @@ self:
(attrs.nativeBuildInputs or []) ++ [ external.git ]; (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 # missing OCaml
merlin = markBroken super.merlin; merlin = markBroken super.merlin;

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

@ -157,6 +157,12 @@ self:
(attrs.nativeBuildInputs or []) ++ [ external.git ]; (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 # missing OCaml
merlin = markBroken super.merlin; merlin = markBroken super.merlin;