1 files changed, 28 insertions, 27 deletions

diff --git a/flake.nix b/flake.nix
index 6c6c331..b362da7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,7 @@
             inherit shell;
             inherit devEnv;
             buildInputs        = [ sqlite ];
-            nativeBuildInputs  = [ dub dmd ldc gdc gnumake ]; # [ dub dmd ]; [ dub ldc ]; [ dub gdc ];
+            nativeBuildInputs  = [ dub ldc gnumake ]; # [ dub dmd ]; [ dub ldc ]; [ dub gdc ];
             buildPhase = ''
               runHook preBuild
               for DC_ in dmd ldmd2 ldc2 gdc gdmd; do
@@ -92,25 +92,25 @@
             inherit installPhase;
             inherit postInstall;
           };
-          spine-search-gdc = stdenv.mkDerivation {
-            inherit pname;
-            inherit version;
-            meta.mainProgram   = "spine_search-gdc";
-            executable         = true;
-            src                = self;
-            inherit shell;
-            inherit devEnv;
-            buildInputs        = [ sqlite ];
-            nativeBuildInputs  = [ dub gdc gnumake ];
-            buildPhase = ''
-              runHook preBuild
-              dub build --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
-              runHook postBuild
-            '';
-            inherit checkPhase;
-            inherit installPhase;
-            inherit postInstall;
-          };
+          #spine-search-gdc = stdenv.mkDerivation {
+          #  inherit pname;
+          #  inherit version;
+          #  meta.mainProgram   = "spine_search-gdc";
+          #  executable         = true;
+          #  src                = self;
+          #  inherit shell;
+          #  inherit devEnv;
+          #  buildInputs        = [ sqlite ];
+          #  nativeBuildInputs  = [ dub gdc gnumake ];
+          #  buildPhase = ''
+          #    runHook preBuild
+          #    dub build --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
+          #    runHook postBuild
+          #  '';
+          #  inherit checkPhase;
+          #  inherit installPhase;
+          #  inherit postInstall;
+          #};
           #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000=";
       });
       devShells = forAllSystems (system:
@@ -141,28 +141,29 @@
             #export spineSqlite="spine --very-verbose --sqlite-update --sqlite-db-path=\"$SpineDBpath\" --sqlite-db-filename=\"spine.search.db\" --output=\"\$SpineOUT\" $SpinePOD/*"
           '';
         in with pkgs; {
-          devShell = mkShell rec {
-            name = "spine dev shell default";
+          devShell = mkShell {
+            name               = "spine base dev shell";
             inherit shell;
             inherit devEnv;
             #buildInputs        = [ sqlite ];
             #nativeBuildInputs  = [ dub dmd ldc gdc gnumake ];
             packages     = [
               sqlite
-              dub dmd ldc gdc gnumake
+              dub dmd ldc gnumake
             ];
             inherit shellHook;
           };
-          devShell-sqlite = mkShell rec {
-            name = "spine dev shell for latex & pdf output";
+          devShell-sqlite = mkShell {
+            name               = "spine dev shell for latex & pdf output";
             inherit shell;
             inherit devEnv;
-            packages     = [
+            packages = [
+              dub dmd ldc gnumake
               sqlite
-              dub dmd ldc gdc gnumake
             ];
             inherit shellHook;
           };
+          default = import ./shell.nix { inherit pkgs; };
       });
   };
 }