diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 2ee99ce973e..eeb4d19f7ac 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -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 = '' diff --git a/pkgs/build-support/emacs/trivial.nix b/pkgs/build-support/emacs/trivial.nix index 98463c56ba9..396c971b2f0 100644 --- a/pkgs/build-support/emacs/trivial.nix +++ b/pkgs/build-support/emacs/trivial.nix @@ -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 ''; }