From bfaa5cbb9205450857eff9120cd11c29149bff74 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Wed, 14 Apr 2021 00:11:02 +0200
Subject: [PATCH] feat(overlays/tvl): Add our emacs packages to the fixpoint

Adds all TVL Emacs packages to the emacsPackages fixpoint unter
`tvlPackages` ... one step closer to native compilation.

Change-Id: I938689ccab057164babfb88cd467a490b3efd39b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3004
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: adisbladis <adisbladis@gmail.com>
---
 third_party/overlays/tvl.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 01f7156ff..4abb8f748 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -1,6 +1,6 @@
 # This overlay is used to make TVL-specific modifications in the
 # nixpkgs tree, where required.
-{ ... }:
+{ depot, ... }:
 
 self: super: {
   # Required for apereo-cas
@@ -24,4 +24,11 @@ self: super: {
   clang-tools = (super.clang-tools.override {
     llvmPackages = self.llvmPackages_11;
   });
+
+  # Add our Emacs packages to the fixpoint
+  emacsPackagesFor = emacs: (
+    (super.emacsPackagesFor emacs).overrideScope' (eself: esuper: {
+      tvlPackages = depot.tools.emacs-pkgs // depot.third_party.emacs;
+    })
+  );
 }