emacsPackagesNg.trivialBuild: cleanup and standardize function

No real function change here, but this updates the trivial and melpa builders to
be formatted more consistently with the rest of the builders, and swaps
`eval "$preBuild"` for the more standard `runHook preBuild`.
This commit is contained in:
Benjamin Hipple 2018-11-27 00:23:04 -05:00
parent 551cee25b6
commit a7d1474023
2 changed files with 13 additions and 19 deletions

View file

@ -61,19 +61,18 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
ln -s "$NIX_BUILD_TOP/$sourceRoot" "$NIX_BUILD_TOP/working/$ename"
'';
buildPhase =
''
runHook preBuild
buildPhase = ''
runHook preBuild
cd "$NIX_BUILD_TOP"
cd "$NIX_BUILD_TOP"
emacs --batch -Q \
-L "$melpa/package-build" \
-l "$melpa2nix" \
-f melpa2nix-build-package \
$ename $version
emacs --batch -Q \
-L "$melpa/package-build" \
-l "$melpa2nix" \
-f melpa2nix-build-package \
$ename $version
runHook postBuild
runHook postBuild
'';
installPhase = ''

View file

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