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:
parent
a834966efd
commit
a8d48d4d9c
3 changed files with 16 additions and 4 deletions
14
third_party/exwm/default.nix
vendored
Normal file
14
third_party/exwm/default.nix
vendored
Normal 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 ];
|
||||||
|
})
|
||||||
|
{ }
|
4
third_party/overlays/tvl.nix
vendored
4
third_party/overlays/tvl.nix
vendored
|
@ -78,9 +78,7 @@ depot.nix.readTree.drvTargets {
|
||||||
notmuch = super.notmuch.emacs;
|
notmuch = super.notmuch.emacs;
|
||||||
|
|
||||||
# Build EXWM with the depot sources instead.
|
# Build EXWM with the depot sources instead.
|
||||||
depotExwm = esuper.exwm.overrideAttrs (_: {
|
depotExwm = eself.callPackage depot.third_party.exwm.override { };
|
||||||
src = depot.path.origSrc + "/third_party/exwm";
|
|
||||||
});
|
|
||||||
|
|
||||||
# Workaround for magit checking the git version at load time
|
# Workaround for magit checking the git version at load time
|
||||||
magit = esuper.magit.overrideAttrs (_: {
|
magit = esuper.magit.overrideAttrs (_: {
|
||||||
|
|
|
@ -58,7 +58,7 @@ pkgs.makeOverridable
|
||||||
elixir-mode
|
elixir-mode
|
||||||
elm-mode
|
elm-mode
|
||||||
erlang
|
erlang
|
||||||
exwm
|
depotExwm
|
||||||
go-mode
|
go-mode
|
||||||
google-c-style
|
google-c-style
|
||||||
gruber-darker-theme
|
gruber-darker-theme
|
||||||
|
|
Loading…
Reference in a new issue