Skip to content

Commit

Permalink
emacsPackages.libgit: Fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
adisbladis committed Sep 20, 2020
1 parent 684d691 commit fa1272e
Showing 1 changed file with 20 additions and 0 deletions.
20 changes: 20 additions & 0 deletions pkgs/applications/editors/emacs-modes/melpa-packages.nix
Expand Up @@ -196,6 +196,26 @@ let

ivy-rtags = fix-rtags super.ivy-rtags;

libgit = super.libgit.overrideAttrs(attrs: {
nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ];
buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ];
dontUseCmakeBuildDir = true;
postPatch = ''
sed -i s/'add_subdirectory(libgit2)'// CMakeLists.txt
'';
postBuild = ''
pushd working/libgit
make
popd
'';
postInstall = ''
outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**)
mkdir $outd/build
install -m444 -t $outd/build ./source/src/libegit2.so
rm -r $outd/src $outd/Makefile $outd/CMakeLists.txt
'';
});

magit = super.magit.overrideAttrs (attrs: {
# searches for Git at build time
nativeBuildInputs =
Expand Down

0 comments on commit fa1272e

Please sign in to comment.