From bf697b4b9d6e2d6a7db0c2573dac52f3efbb2872 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 10 Jan 2021 16:17:24 +0300 Subject: refactor(3p/exwm): Inline build instructions instead of overriding Change-Id: If16a57e8dd905c8f709bee70dac575509dd22b02 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2343 Reviewed-by: tazjin Tested-by: BuildkiteCI --- third_party/emacs/exwm/default.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'third_party') diff --git a/third_party/emacs/exwm/default.nix b/third_party/emacs/exwm/default.nix index e1680a37d9..b9941e83b0 100644 --- a/third_party/emacs/exwm/default.nix +++ b/third_party/emacs/exwm/default.nix @@ -1,7 +1,22 @@ # EXWM is present in nixpkgs and we do not (currently) intend to # change the code structure, so the existing drv can be reused. -{ pkgs, ... }: +{ pkgs, lib, ... }: -pkgs.emacsPackages.exwm.overrideAttrs(_: { +let + inherit (pkgs.emacsPackages) melpaBuild xelb; +in melpaBuild { + pname = "exwm"; + ename = "exwm"; + version = "0.24"; src = ./.; -}) + packageRequires = [ xelb ]; + + recipe = builtins.toFile "recipe.el" '' + (exwm :fetcher github :repo "ch11ng/exwm") + ''; + + meta = { + homepage = "https://elpa.gnu.org/packages/exwm.html"; + license = lib.licenses.free; + }; +} -- cgit 1.4.1