From 9e9c822ec2814c34045c38c0f41483a14936e584 Mon Sep 17 00:00:00 2001
From: Marien Zwart <marien.zwart@gmail.com>
Date: Thu, 25 Apr 2024 17:00:39 +1000
Subject: [PATCH] Fix build of doom-minimal / doom-full

This broke a while back without me noticing. I should set up proper
tests...
---
 doom.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doom.nix b/doom.nix
index 18bd7cd..3e42b53 100644
--- a/doom.nix
+++ b/doom.nix
@@ -38,9 +38,7 @@
   makeBinaryWrapper,
 }:
 let
-  inherit (lib) optionalAttrs optionalString;
-
-  doomInitFile = "${doomDir}/init.el";
+  inherit (lib) optionalAttrs optionalString pathExists;
 
   # Step 1: determine which Emacs packages to pull in.
   #
@@ -239,7 +237,13 @@ let
 
   # Step 4: build a final DOOMDIR with packages.el from step 1.
 
-  finalInitFile = concatText "doom-init" [ ./pre-init.el doomInitFile ];
+  finalInitFile = let
+    doomInitFile = "${doomDir}/init.el";
+  in
+    if pathExists doomInitFile
+    then concatText "doom-init" [ ./pre-init.el doomInitFile ]
+    else ./pre-init.el;
+
   finalDoomDir = runCommand "doom-dir" {} ''
     mkdir $out
     if [[ -n "$(ls -A1 ${doomDir})" ]]; then