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

emacsPackagesNg.magit: find Git during build

Browse Source
This commit is contained in:
Thomas Tuegel 2018-07-16 05:34:03 -05:00
parent d3cea48608
commit a5f026f778
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,11 +124,16 @@ self:
# upstream issue: missing file header
maxframe = markBroken super.maxframe;
# version of magit-popup needs to match magit
# https://github.com/magit/magit/issues/3286
magit = super.magit.override {
inherit (self.melpaPackages) magit-popup;
};
magit =
(super.magit.override {
# version of magit-popup needs to match magit
# https://github.com/magit/magit/issues/3286
inherit (self.melpaPackages) magit-popup;
}).overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
# missing OCaml
merlin = markBroken super.merlin;

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

@ -13,7 +13,7 @@ To update the list of packages from MELPA,
*/
{ lib }:
{ lib, external }:
self:
@ -132,6 +132,17 @@ self:
# upstream issue: missing file header
maxframe = markBroken super.maxframe;
magit =
(super.magit.override {
# version of magit-popup needs to match magit
# https://github.com/magit/magit/issues/3286
inherit (self.melpaStablePackages) magit-popup;
}).overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
(attrs.nativeBuildInputs or []) ++ [ external.git ];
});
# missing OCaml
merlin = markBroken super.merlin;

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

@ -15905,7 +15905,8 @@ with pkgs;
external = {
inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent;
inherit (pythonPackages) elpy;
inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m;
inherit
autoconf automake git libffi libpng pkgconfig poppler rtags w3m zlib;
};
};

2
pkgs/top-level/emacs-packages.nix
View File

@ -50,7 +50,7 @@ let
};
melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix {
inherit lib;
inherit external lib;
};
melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {