fix(3p/exwm): fix EXWM build with depot sources

Something changed in the machinery and broke the overriding. I didn't
notice this, as a I was temporarily using an unpatched EXWM.

Change-Id: I1a4e8ea63bd116d86a430e680c2b631474e9a0fe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10047
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2023-11-16 11:18:10 +03:00 committed by tazjin
parent a834966efd
commit a8d48d4d9c
3 changed files with 16 additions and 4 deletions

14
third_party/exwm/default.nix vendored Normal file
View file

@ -0,0 +1,14 @@
{ depot, pkgs, lib, ... }:
# special dance for overriding this into the fixed-point of emacs
# packages, but having it be separately buildable.
pkgs.emacsPackages.callPackage
({ trivialBuild, xelb }: trivialBuild {
pname = "depot-exwm";
version = "canon";
src = ./.;
packageRequires = [ xelb ];
})
{ }

View file

@ -78,9 +78,7 @@ depot.nix.readTree.drvTargets {
notmuch = super.notmuch.emacs;
# Build EXWM with the depot sources instead.
depotExwm = esuper.exwm.overrideAttrs (_: {
src = depot.path.origSrc + "/third_party/exwm";
});
depotExwm = eself.callPackage depot.third_party.exwm.override { };
# Workaround for magit checking the git version at load time
magit = esuper.magit.overrideAttrs (_: {

View file

@ -58,7 +58,7 @@ pkgs.makeOverridable
elixir-mode
elm-mode
erlang
exwm
depotExwm
go-mode
google-c-style
gruber-darker-theme