From badd5fe16d04828bdd6d38b9ec3f237555760e0c Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Sat, 10 Jun 2023 23:01:53 -0400
Subject: nix configure

---
 flake.nix | 67 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 24 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 4f487f0..0ac58cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,7 +73,7 @@
           inherit installPhase;
           inherit postInstall;
         };
-        spine-dmd = stdenv.mkDerivation {
+        spine-overlay-dmd = stdenv.mkDerivation {
           inherit pname;
           inherit version;
           meta.mainProgram = "spine-dmd";
@@ -92,7 +92,7 @@
           inherit installPhase;
           inherit postInstall;
         };
-        spine-ldc = stdenv.mkDerivation {
+        spine-overlay-ldc = stdenv.mkDerivation {
           inherit pname;
           inherit version;
           meta.mainProgram = "spine-ldc";
@@ -111,7 +111,26 @@
           inherit installPhase;
           inherit postInstall;
         };
-        #spine-gdc = stdenv.mkDerivation {
+        spine-nixpkgs-ldc = stdenv.mkDerivation {
+          inherit pname;
+          inherit version;
+          meta.mainProgram = "spine-ldc";
+          executable = true;
+          src = self;
+          inherit shell;
+          inherit devEnv;
+          buildInputs = with pkgs; [sqlite];
+          nativeBuildInputs = with pkgs; [dub ldc gnumake];
+          buildPhase = ''
+            runHook preBuild
+            dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
+            runHook postBuild
+          '';
+          inherit checkPhase;
+          inherit installPhase;
+          inherit postInstall;
+        };
+        #spine-overlay-gdc = stdenv.mkDerivation {
         #  inherit pname;
         #  inherit version;
         #  meta.mainProgram = "spine-gdc";
@@ -147,57 +166,57 @@
       '';
     in
       with pkgs-ovl; {
-        devShell = mkShell {
+        dsh-overlay = mkShell {
           name = "spine base dev shell";
           inherit shell;
           inherit devEnv;
           #buildInputs = [ sqlite ];
           #nativeBuildInputs = [ dub dmd ldc gdc gnumake ];
           packages = [
-            sqlite
             ldc
             #dmd
             dub
             gnumake
+            sqlite
           ];
           inherit shellHook;
         };
-        devShell-dmd = mkShell {
+        dsh-overlay-dmd-dub = mkShell {
           name = "spine base dev shell";
           inherit shell;
           inherit devEnv;
           #buildInputs = [ sqlite ];
           #nativeBuildInputs = [ dub dmd ldc gdc gnumake ];
           packages = [
-            sqlite
             dmd
             dub
             gnumake
+            sqlite
           ];
           inherit shellHook;
         };
-        devShell-ldc = mkShell {
+        dsh-overlay-ldc-dub = mkShell {
           name = "spine base dev shell";
           inherit shell;
           inherit devEnv;
           #buildInputs = [ sqlite ];
           #nativeBuildInputs = [ dub dmd ldc gdc gnumake ];
           packages = [
-            sqlite
             ldc
             dub
             gnumake
+            sqlite
           ];
           inherit shellHook;
         };
-        devShell-epub = mkShell {
+        dsh-epub = mkShell {
           name = "spine dev shell for epub output";
           inherit shell;
           inherit devEnv;
           packages = [
-            dub
-            #dmd
             ldc
+            #dmd
+            dub
             gnumake
             sqlite
             libxml2
@@ -217,27 +236,27 @@
           ];
           inherit shellHook;
         };
-        devShell-html = mkShell {
+        dsh-html = mkShell {
           name = "spine dev shell for latex & pdf output";
           inherit shell;
           inherit devEnv;
           packages = [
-            dub
-            #dmd
             ldc
+            #dmd
+            dub
             gnumake
             sqlite
           ];
           inherit shellHook;
         };
-        devShell-latex-pdf = mkShell {
+        dsh-latex-pdf = mkShell {
           name = "spine dev shell for latex & pdf output";
           inherit shell;
           inherit devEnv;
           packages = [
-            dub
-            #dmd
             ldc
+            #dmd
+            dub
             gnumake
             sqlite
             source-sans-pro
@@ -247,27 +266,27 @@
           ];
           inherit shellHook;
         };
-        devShell-sqlite = mkShell {
+        dsh-sqlite = mkShell {
           name = "spine dev shell for latex & pdf output";
           inherit shell;
           inherit devEnv;
           packages = [
-            dub
-            #dmd
             ldc
+            #dmd
+            dub
             gnumake
             sqlite
           ];
           inherit shellHook;
         };
-        devShell-i18n = mkShell {
+        dsh-i18n = mkShell {
           name = "spine dev shell internationalization, po4a";
           inherit shell;
           inherit devEnv;
           packages = [
-            dub
-            #dmd
             ldc
+            #dmd
+            dub
             gnumake
             sqlite
             perl534Packages.Po4a
-- 
cgit v1.2.3