1 files changed, 44 insertions, 43 deletions

diff --git a/org/config_nix.org b/org/config_nix.org
index ee9b157..41efed4 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -96,7 +96,7 @@
           inherit installPhase;
           inherit postInstall;
         };
-        spine-dmd = stdenv.mkDerivation {
+        spine-overlay-dmd = stdenv.mkDerivation {
           inherit pname;
           inherit version;
           meta.mainProgram = "spine-dmd";
@@ -115,7 +115,7 @@
           inherit installPhase;
           inherit postInstall;
         };
-        spine-ldc = stdenv.mkDerivation {
+        spine-overlay-ldc = stdenv.mkDerivation {
           inherit pname;
           inherit version;
           meta.mainProgram = "spine-ldc";
@@ -134,7 +134,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";
@@ -170,57 +189,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
@@ -240,27 +259,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
@@ -270,27 +289,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
@@ -361,28 +380,10 @@ with pkgs;
       # perl534Packages.Po4a
     ];
     shellHook = ''
-      echo '
-        shell.nix echo ❯❯
-
-        ❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell" -c zsh
-
-        ❯❯ nix develop
-        ❯❯ nix develop -c zsh
-
-        ❯❯ nix build
-        ❯❯ nix build ".#default" --print-build-logs
-        ❯❯ nix build ".#spine-dmd" --print-build-logs |& nom
-        ❯❯ nix build ".#spine-ldc" --print-build-logs |& nom
-        ❯❯ nix build ".#spine-gdc" --print-build-logs |& nom
-
-        ❯❯ nix profile install .
-      '
     '';
   }
 #+END_SRC
 
-echo "ldc `${pkgs.ldc}/bin/ldc2 -v`"
-
 ** default.nix :default:
 
 #+HEADER: :tangle ../default.nix
@@ -872,7 +873,7 @@ webserv:
   data_root_url:               "https://sisudoc.org"
   data_root_path:              "/srv/www/spine"
   images_root_part:            "image"
-  cgi_search_form_title:       "≅ SiSU Spine search"
+  cgi_search_form_title:       "≅ SiSU Spine search ፨"
   cgi_http:                    "https"
   cgi_domain:                  "sisudoc.org"
   cgi_bin_url:                 "http://sisudoc.org/cgi-bin"