From 1e71b80f6a734ee2d16ccc5bc51dba2788a89641 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <Vincent Ambo>
Date: Sun, 5 Jan 2020 17:09:21 +0000
Subject: [PATCH] fix(emacs): Build emacs with imagemagick support

---
 third_party/default.nix | 1 +
 tools/emacs/default.nix | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/third_party/default.nix b/third_party/default.nix
index e3c0f7832..abef9e872 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -47,6 +47,7 @@ let
       gzip
       haskell
       iana-etc
+      imagemagickBig
       jq
       kontemplate
       lib
diff --git a/tools/emacs/default.nix b/tools/emacs/default.nix
index d36673e36..e5c695a3e 100644
--- a/tools/emacs/default.nix
+++ b/tools/emacs/default.nix
@@ -8,8 +8,12 @@ with third_party.emacsPackagesNg;
 with third_party.emacs;
 
 let
+  emacsWithImagemagick = third_party.emacs26.override {
+    # See https://github.com/NixOS/nixpkgs/issues/70631
+    imagemagick = third_party.imagemagickBig;
+  };
   localPackages = pkgs.tools.emacs-pkgs;
-  emacsWithPackages = (third_party.emacsPackagesNgGen third_party.emacs26).emacsWithPackages;
+  emacsWithPackages = (third_party.emacsPackagesNgGen emacsWithImagemagick).emacsWithPackages;
 
   # $PATH for binaries that need to be available to Emacs
   emacsBinPath = lib.makeBinPath [ third_party.telega ];