diff options
| -rw-r--r-- | third_party/exwm/default.nix | 14 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 4 | ||||
| -rw-r--r-- | users/tazjin/emacs/default.nix | 2 |
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 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 (_: { diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix index de21cc5908..24068d6869 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 |