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

Merge pull request #66642 from etu/emacspackagesng-emacsql-fix-sqlite

Browse Source 
emacsPackagesNg.emacsql-sqlite: Build sqlite binary
This commit is contained in:
adisbladis 2019-08-15 09:55:10 +01:00 committed by GitHub
commit 2f1cb20e50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,6 +73,23 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac
propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ]; propagatedUserEnvPkgs = old.propagatedUserEnvPkgs ++ [ external.elpy ];
}); });
emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
postBuild = ''
cd source/sqlite
make
cd -
'';
postInstall = ''
install -m=755 -D source/sqlite/emacsql-sqlite \
$out/share/emacs/site-lisp/elpa/emacsql-sqlite-${old.version}/sqlite/emacsql-sqlite
'';
stripDebugList = [ "share" ];
});
evil-magit = super.evil-magit.overrideAttrs (attrs: { evil-magit = super.evil-magit.overrideAttrs (attrs: {
# searches for Git at build time # searches for Git at build time
nativeBuildInputs = nativeBuildInputs =