diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-09-20 22:27:19 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-10-01 16:36:46 +0000 |
| commit | c4ca7e75315ad3da5e0240e08ed7c9cbf89fc23a (patch) | |
| tree | 6634d2036ec906d953dfcde090516fd290a48896 /nixpkgs | |
| parent | ed0a24db231ece2e34d61bff57cefa7443ffbb25 (diff) | |
| download | nixlib-c4ca7e75315ad3da5e0240e08ed7c9cbf89fc23a.tar nixlib-c4ca7e75315ad3da5e0240e08ed7c9cbf89fc23a.tar.gz nixlib-c4ca7e75315ad3da5e0240e08ed7c9cbf89fc23a.tar.bz2 nixlib-c4ca7e75315ad3da5e0240e08ed7c9cbf89fc23a.tar.lz nixlib-c4ca7e75315ad3da5e0240e08ed7c9cbf89fc23a.tar.xz nixlib-c4ca7e75315ad3da5e0240e08ed7c9cbf89fc23a.tar.zst nixlib-c4ca7e75315ad3da5e0240e08ed7c9cbf89fc23a.zip | |
emacsPackages.libgit: Fix build
(cherry picked from commit fa1272e956c54fa813790c9340e4d3cb3784a891)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix index c48e342977e3..03e9923f737a 100644 --- a/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -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 = |