diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-03-30 13:30:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-03-31 10:13:20 +0000 |
commit | f2e61678de300336b3666afd19af7565efb0c4cf (patch) | |
tree | 49f6906c9d557f7fdd58257ff85ec17fc4495f31 /nixpkgs/pkgs/development/tools/cask/default.nix | |
parent | f920d5e07c29a9aa1b77d9b88bd604cf1a1f3664 (diff) | |
parent | 00e27c78d3d2de6964096ceee8d70e5b487365e3 (diff) | |
download | nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.gz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.bz2 nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.lz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.xz nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.tar.zst nixlib-f2e61678de300336b3666afd19af7565efb0c4cf.zip |
Merge commit '00e27c78d3d2de6964096ceee8d70e5b487365e3'
Conflicts: nixpkgs/nixos/modules/system/boot/systemd.nix nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/common.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/pink.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/cask/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/tools/cask/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/tools/cask/default.nix b/nixpkgs/pkgs/development/tools/cask/default.nix index f9e7d215f320..2eadc6b877f7 100644 --- a/nixpkgs/pkgs/development/tools/cask/default.nix +++ b/nixpkgs/pkgs/development/tools/cask/default.nix @@ -20,20 +20,22 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild + emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el + runHook postBuild ''; installPhase = '' runHook preInstall + mkdir -p $out/bin - mkdir -p $out/templates - mkdir -p $out/share/emacs/site-lisp/cask/bin - install -Dm644 *.el *.elc $out/share/emacs/site-lisp/cask - install -Dm755 bin/cask $out/share/emacs/site-lisp/cask/bin - install -Dm644 templates/* $out/templates/ + dir=$out/share/emacs/site-lisp/cask + install -Dm444 -t $dir *.el *.elc + install -Dm555 -t $dir/bin bin/cask touch $out/.no-upgrade - ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask + ln -s $dir/bin/cask $out/bin/cask + runHook postInstall ''; @@ -48,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://cask.readthedocs.io/en/latest/index.html"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ flexw ]; platforms = platforms.all; - maintainers = [ maintainers.flexw ]; }; } |