From 2c1bf99ddfddb32d39e85772548aa3f993484f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <laszlo.vasko@outlook.com>
Date: Wed, 24 Jun 2020 09:50:14 +0200
Subject: [PATCH] Revert "Merge branch 'issue/14'"

This reverts commit 4f34bddc8d6779c69879e7e76ba1064f2c2ba9be, reversing
changes made to f01b817c7332cbab1dcccd192599459422ca5b7e.

Resolves: #17
---
 default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/default.nix b/default.nix
index dd8ffa6..eb1c857 100644
--- a/default.nix
+++ b/default.nix
@@ -172,17 +172,19 @@ let
     load-config-from-site
   ]));
 in
-emacs.overrideAttrs (esuper: {
-  buildCommand = esuper.buildCommand + ''
-    for prog in $out/bin/*; do
-      wrapProgram $out/bin/$(basename $prog) --set DOOMDIR ${doomDir}
+pkgs.runCommand "doom-emacs" {
+  inherit emacs;
+  buildInputs = [ emacs ];
+  nativeBuildInputs = [ makeWrapper ];
+} ''
+    mkdir -p $out/bin
+    for prog in $emacs/bin/*; do
+      makeWrapper $prog $out/bin/$(basename $prog) --set DOOMDIR ${doomDir}
     done
     # emacsWithPackages assumes share/emacs/site-lisp/subdirs.el
     # exists, but doesn't pass it along.  When home-manager calls
     # emacsWithPackages again on this derivation, it fails due to
     # a dangling link to subdirs.el.
     # https://github.com/NixOS/nixpkgs/issues/66706
-    rm -rf $out/share
-    ln -s ${esuper.emacs}/share $out
-  '';
-})
+    ln -s ${emacs.emacs}/share $out
+  ''