From 89077febca032ff9990a163a8cdb7f3bc62c3954 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 21 Feb 2023 18:56:06 -0500
Subject: nix flake & build, temp. remove gdc

---
 flake.nix | 53 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 00bcaad..4bdbcba 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,9 +22,15 @@
           default              = spine.packages.${system}.default;
           spine-dmd            = spine.packages.${system}.spine-dmd;
           spine-ldc            = spine.packages.${system}.spine-ldc;
-          spine-gdc            = spine.packages.${system}.spine-gdc;
+          #spine-gdc            = spine.packages.${system}.spine-gdc;
           #vendorSha256         = "sha256-0Q00000000000000000000000000000000000000000=";
-        });
+      });
+      apps = forAllSystems (system: {
+        default = {
+          type                 = "app";
+          program              = "${self.packages.${system}.default}/bin/spine";
+        };
+      });
       devShells = forAllSystems (system:
         let
           pkgs = nixpkgsFor.${system};
@@ -55,24 +61,24 @@
             #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 base dev shell";
+          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-epub = mkShell rec {
-            name = "spine dev shell for epub output";
+          devShell-epub = mkShell {
+            name               = "spine dev shell for epub output";
             inherit shell;
             inherit devEnv;
-            packages     = [
-              dub dmd ldc gdc gnumake
+            packages = [
+              dub dmd ldc gnumake
               sqlite
               libxml2
               html-tidy
@@ -91,22 +97,22 @@
             ];
             inherit shellHook;
           };
-          devShell-html = mkShell rec {
-            name = "spine dev shell for latex & pdf output";
+          devShell-html = mkShell {
+            name               = "spine dev shell for latex & pdf output";
             inherit shell;
             inherit devEnv;
-            packages     = [
-              dub dmd ldc gdc gnumake
+            packages = [
+              dub dmd ldc gnumake
               sqlite
             ];
             inherit shellHook;
           };
-          devShell-latex-pdf = mkShell rec {
-            name = "spine dev shell for latex & pdf output";
+          devShell-latex-pdf = mkShell {
+            name               = "spine dev shell for latex & pdf output";
             inherit shell;
             inherit devEnv;
-            packages     = [
-              dub dmd ldc gdc gnumake
+            packages = [
+              dub dmd ldc gnumake
               sqlite
               source-sans-pro
               source-serif-pro
@@ -115,21 +121,22 @@
             ];
             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     = [
-              dub dmd ldc gdc gnumake
+            packages = [
+              dub dmd ldc gnumake
               sqlite
             ];
             inherit shellHook;
           };
           devShell-i18n = mkShell {
+            name               = "spine dev shell internationalization, po4a";
             inherit shell;
             inherit devEnv;
-            packages     = [
-              dub dmd ldc gdc gnumake
+            packages = [
+              dub dmd ldc gnumake
               sqlite
               perl534Packages.Po4a
             ];
-- 
cgit v1.2.3