From a4d539be9fdfe780bfa8cebb878f4acdab8f58d5 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 15 Sep 2021 00:10:39 -0300 Subject: [PATCH] emacsPackages.rect-mark: use trivialBuild --- .../elisp-packages/rect-mark/default.nix | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix b/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix index 2214b1448d30..aef7fbf8c9a0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix @@ -1,35 +1,26 @@ -{ lib, stdenv, fetchurl, emacs }: +{ lib +, trivialBuild +, fetchFromGitHub +, emacs + }: -stdenv.mkDerivation { +trivialBuild rec { pname = "rect-mark"; version = "1.4"; - src = fetchurl { - url = "http://emacswiki.org/emacs/download/rect-mark.el"; - sha256 = "0pyyg53z9irh5jdfvh2qp4pm8qrml9r7lh42wfmdw6c7f56qryh8"; + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = pname; + rev = version; + hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM="; }; - dontUnpack = true; - buildInputs = [ emacs ]; - buildPhase = '' - cp $src rect-mark.el - emacs --batch -f batch-byte-compile rect-mark.el - ''; - - installPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp - install rect-mark.el* $out/share/emacs/site-lisp - runHook postInstall - ''; - - meta = { - description = "Mark a rectangle of text with highlighting"; + meta = with lib; { homepage = "http://emacswiki.org/emacs/RectangleMark"; - license = lib.licenses.gpl2Plus; - - platforms = lib.platforms.all; + description = "Mark a rectangle of text with highlighting"; + license = licenses.gpl2Plus; + inherit (emacs.meta) platforms; }; }