diff options
| author | Vincent Ambo <tazjin@tvl.su> | 2023-11-16T08·18+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2023-11-22T07·39+0000 |
| commit | a8d48d4d9c2c4f1f4c97007271c1bfc36d989c74 (patch) | |
| tree | 129b215ab56c2e7de66677738b97fd7ccb201572 /third_party | |
| parent | a834966efd64c1b2306241c3ef20f4258f6b9c4e (diff) | |
fix(3p/exwm): fix EXWM build with depot sources r/7044
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
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/exwm/default.nix | 14 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/third_party/exwm/default.nix b/third_party/exwm/default.nix new file mode 100644 index 0000000000..6daee882fe --- /dev/null +++ b/third_party/exwm/default.nix @@ -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 ]; + }) +{ } diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index fd060214cf..2920fac103 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -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 (_: { |