about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-08-18T21·53+0100
committertazjin <mail@tazj.in>2020-08-18T22·06+0000
commit4ed096b7d7a92a7bfc637da95dccfc9fdb241994 (patch)
tree786a9e5011bac96cd6ce9e61d8c0bff3c63ecf3c
parent290df663afdfcbc6c3cc0665948b198d875ddcf8 (diff)
chore(3p/emacs): Enable cairo for Emacs 27.1 r/1675
... this in turn enables support for Harfbuzz, which enables support
for ligatures - maybe this will make grfn happy!

Change-Id: I331c5171a829800fe532ca0b0d4910478e63ef1b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1783
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
-rw-r--r--third_party/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/third_party/default.nix b/third_party/default.nix
index 14fbe80e73..897602f31e 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -223,7 +223,10 @@ in exposed.lib.fix(self: exposed // {
   # The assert exists because the name of the attribute is unversioned
   # (which is different from previous versions).
   emacs27 = assert ((exposed.lib.versions.major nixpkgs.emacs.version) == "27");
-    nixpkgs.emacs;
+    nixpkgs.emacs.overrideAttrs(old: {
+      configureFlags = old.configureFlags ++ [ "--with-cairo" ];
+    });
+
   emacs27-nox = assert ((exposed.lib.versions.major nixpkgs.emacs.version) == "27");
     nixpkgs.emacs-nox;