From 98d439a704fcf41ebc6534bf44a20afafd15053e Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 11 Jul 2023 21:56:43 -0400
Subject: flake.nix minor

---
 org/config_dub.org |  8 ++++----
 org/config_nix.org | 20 ++++++++------------
 2 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'org')

diff --git a/org/config_dub.org b/org/config_dub.org
index d8e39f3..e6b2697 100644
--- a/org/config_dub.org
+++ b/org/config_dub.org
@@ -54,7 +54,7 @@
   "buildTypes": {
     "dmd": {
       "dflags":                [ "-J=views", "-I=src" ],
-      "buildOptions":          [ "inline", "verbose"  ],
+      "buildOptions":          [ "inline", "verbose" ],
       "buildRequirements":     [ "allowWarnings" ]
     },
     "ldc2": {
@@ -64,7 +64,7 @@
     },
     "ldmd2": {
       "dflags":                [ "-O2", "-boundscheck=on", "-J=views", "-I=src", "-color=on" ],
-      "buildOptions":          [ "optimize", "inline", "verbose"  ],
+      "buildOptions":          [ "optimize", "inline", "verbose" ],
       "buildRequirements":     [ "allowWarnings" ]
     },
     "gdc": {
@@ -79,8 +79,8 @@
     }
   },
   "dependencies": {
-    "spine_search:arsd.cgi":     "*",
-    "spine_search:d2sqlite3":    "*"
+    "spine_search:arsd.cgi":   "*",
+    "spine_search:d2sqlite3":  "*"
   },
   "subPackages": [
     {
diff --git a/org/config_nix.org b/org/config_nix.org
index fb282b3..048b25b 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -64,6 +64,9 @@
       ];
       inherit system;
     };
+    preBuild = ''
+      export HOME=$(pwd)
+    '';
     installPhase = ''
       runHook preInstall
       mkdir -p $out/share/cgi-bin
@@ -88,9 +91,6 @@
           inherit devEnv;
           buildInputs = [sqlite];
           nativeBuildInputs = [dub ldc gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             for DC_ in dmd ldmd2 ldc2 gdc gdmd; do
@@ -103,6 +103,7 @@
             dub build --cache=local --compiler=$DC --build=$DC_ --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -117,14 +118,12 @@
           inherit devEnv;
           buildInputs = [sqlite];
           nativeBuildInputs = [dub dmd gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -139,14 +138,12 @@
           inherit devEnv;
           buildInputs = [sqlite];
           nativeBuildInputs = [dub ldc gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -161,14 +158,12 @@
           inherit devEnv;
           buildInputs = with pkgs; [sqlite];
           nativeBuildInputs = with pkgs; [dub ldc gnumake];
-          preBuild = ''
-            export HOME=$(pwd)
-          '';
           buildPhase = ''
             runHook preBuild
             dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
             runHook postBuild
           '';
+          inherit preBuild;
           inherit checkPhase;
           inherit installPhase;
           inherit postInstall;
@@ -188,6 +183,7 @@
         #    dub build --cache=local --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
         #    runHook postBuild
         #  '';
+        #  inherit preBuild;
         #  inherit checkPhase;
         #  inherit installPhase;
         #  inherit postInstall;
-- 
cgit v1.2.3