blah

modules/home/emacs.nix

@@ -84,7 +84,7 @@ in {
       };
 
       my-texlive = pkgs.texlive.combine
-        (essentialTexPackages ++ cfg.tex.extraTexPackages);
+        (essentialTexPackages // cfg.tex.extraTexPackages);
 
       sydmacs =
         let ewp = (pkgs.emacsPackagesFor cfg.package).emacsWithPackages
@@ -95,17 +95,26 @@ in {
           nativeBuildInputs = [
             pkgs.makeWrapper
           ];
-          postBuild = ''
-            # Read all emacs binaries into a Bash array.
-            readarray -d "" emacsen \
-             < <(find "$out/bin" \( -name emacs -or -name 'emacs-*' \) -print0)
+          postBuild =
+            let
+              runtime-binaries = [
+                pkgs.git # Dependency of Straight.el.
+                pkgs.ghostscript # For TeX.
+                my-texlive
+                pkgs.unzip # For jump-to-source.
+              ];
+            in ''
+              # Read all emacs binaries into a Bash array.
+              readarray -d "" emacsen \
+               < <(find "$out/bin" \( -name emacs -or -name 'emacs-*' \) -print0)
 
-            for emacs in "''${emacsen[@]}"; do
-              wrapProgram "$emacs" \
-                --add-flags "--init-directory \"${cfg.userDir}\"" \
-                ${cfg.extraWrapProgramArgs}
-            done
-          '';
+              for emacs in "''${emacsen[@]}"; do
+                wrapProgram "$emacs" \
+                  --add-flags "--init-directory \"${cfg.userDir}\"" \
+                  --prefix PATH : "${lib.makeBinPath runtime-binaries}" \
+                  ${cfg.extraWrapProgramArgs}
+              done
+            '';
           meta = cfg.package.meta;
           version = cfg.package.version;
         };