about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@tvl.su>2023-11-16T08·18+0300
committertazjin <tazjin@tvl.su>2023-11-22T07·39+0000
commita8d48d4d9c2c4f1f4c97007271c1bfc36d989c74 (patch)
tree129b215ab56c2e7de66677738b97fd7ccb201572
parenta834966efd64c1b2306241c3ef20f4258f6b9c4e (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
-rw-r--r--third_party/exwm/default.nix14
-rw-r--r--third_party/overlays/tvl.nix4
-rw-r--r--users/tazjin/emacs/default.nix2
3 files changed, 16 insertions, 4 deletions
diff --git a/third_party/exwm/default.nix b/third_party/exwm/default.nix
new file mode 100644
index 000000000000..6daee882feda
--- /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 fd060214cfaf..2920fac103f5 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 (_: {
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index de21cc590846..24068d68691d 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -58,7 +58,7 @@ pkgs.makeOverridable
       elixir-mode
       elm-mode
       erlang
-      exwm
+      depotExwm
       go-mode
       google-c-style
       gruber-darker-theme