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

Merge pull request #51095 from bhipple/fix/emacs-builders

Browse Source 
emacsPackagesNg.trivialBuild: cleanup and standardize function
This commit is contained in:
Thomas Tuegel 2018-11-27 09:34:12 -06:00 committed by GitHub
commit 762295a39c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/build-support/emacs/melpa.nix
View File

@ -61,8 +61,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename" ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename"
''; '';
buildPhase = buildPhase = ''
''
runHook preBuild runHook preBuild
cd "$NIX_BUILD_TOP" cd "$NIX_BUILD_TOP"

13
pkgs/build-support/emacs/trivial.nix
View File

@ -7,27 +7,22 @@ with lib;
args: args:
import ./generic.nix envargs ({ import ./generic.nix envargs ({
#preConfigure = ''
# export LISPDIR=$out/share/emacs/site-lisp
# export VERSION_SPECIFIC_LISPDIR=$out/share/emacs/site-lisp
#'';
buildPhase = '' buildPhase = ''
eval "$preBuild" runHook preBuild
emacs -L . --batch -f batch-byte-compile *.el emacs -L . --batch -f batch-byte-compile *.el
eval "$postBuild" runHook postBuild
''; '';
installPhase = '' installPhase = ''
eval "$preInstall" runHook preInstall
LISPDIR=$out/share/emacs/site-lisp LISPDIR=$out/share/emacs/site-lisp
install -d $LISPDIR install -d $LISPDIR
install *.el *.elc $LISPDIR install *.el *.elc $LISPDIR
eval "$postInstall" runHook postInstall
''; '';
} }