git.iko.soy/typeable/nixpkgs
on master help sign in
cask: clean up and byte compile

cc @FlexW

commitfcd769b721d87377dc75e3ce4bafb8d970fb44af authorHerwig Hochleitner <herwig@bendlas.net> dateThu 11 Apr 2019, 02:37 (8 years ago) parent51be4c6
1 file changed+11−8
pkgs/development/tools/cask/default.nix+11−8
pkgs/development/tools/cask/default.nix+11−8
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, emacs, python }:
1+{ stdenv, fetchurl, python, emacsPackages }:
22
33stdenv.mkDerivation rec {
44 name = "cask-${version}";
@@ -10,18 +10,21 @@ stdenv.mkDerivation rec {
1010 };
1111
1212 doCheck = true;
13−
14− dontBuild = true;
13+ buildInputs = with emacsPackages; [ s dash f ansi ecukes servant ert-runner el-mock
14+ noflet ert-async shell-split-string git package-build ];
15+ buildPhase = ''
16+ emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
17+ '';
1518
1619 installPhase = ''
1720 mkdir -p $out/bin
1821 mkdir -p $out/templates
19− install -Dm644 *.el $out/
20− install -Dm755 bin/cask $out/bin
22+ mkdir -p $out/share/emacs/site-lisp/cask/bin
23+ install -Dm644 *.el *.elc $out/share/emacs/site-lisp/cask
24+ install -Dm755 bin/cask $out/share/emacs/site-lisp/cask/bin
2125 install -Dm644 templates/* $out/templates/
2226 touch $out/.no-upgrade
23− mkdir -p $out/usr/share/emacs/site-lisp/cask
24− ln -s cask{,-bootstrap}.el $out/usr/share/emacs/site-lisp/cask/
27+ ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
2528 '';
2629
2730 meta = with stdenv.lib; {
@@ -39,5 +42,5 @@ stdenv.mkDerivation rec {
3942 maintainers = [ maintainers.flexw ];
4043 };
4144
42− nativeBuildInputs = [ emacs python ];
45+ nativeBuildInputs = [ emacsPackages.emacs python ];
4346}