nix & build housekeeping

2 files changed, 45 insertions, 12 deletions

diff --git a/org/config_make.org b/org/config_make.org
index 421892c..9dca7f9 100644
--- a/org/config_make.org
+++ b/org/config_make.org
@@ -252,6 +252,22 @@ markup_dir_samples:
 
 #+NAME: make_set_nix
 #+BEGIN_SRC makefile
+nix-devshell:
+	echo -ne "\n- nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell\n\n- nix build .#default --print-build-logs\n- nix build .#spine-dmd --print-build-logs\n- nix build .#spine-ldc --print-build-logs\n- nix build .#spine-gdc --print-build-logs\n\n"; \
+	nix flake update && nix flake check --show-trace && nix flake show && nix develop .#devShell
+
+nix-build-default:
+	nix build .#default --print-build-logs
+
+nix-build-dmd:
+	nix build .#spine-dmd --print-build-logs
+
+nix-build-ldc:
+	nix build .#spine-ldc --print-build-logs
+
+nix-build-gdc:
+	nix build .#spine-gdc --print-build-logs
+
 buildPhase:
 	HOME=$${PWD}; \
 	for DC_ in dmd ldmd2 gdmd; do \
diff --git a/org/config_nix.org b/org/config_nix.org
index dd8c548..c036a14 100644
--- a/org/config_nix.org
+++ b/org/config_nix.org
@@ -44,7 +44,6 @@ if ! has nix_direnv_version || ! nix_direnv_version ${NixDirEnvVersion}; then
 # source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-0000000000000000000000000000000000000000000="
   source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/${NixDirEnvVersion}/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc="
 fi
-# reload when these files change
 watch_file flake.lock
 watch_file flake.nix
 nix flake update && nix flake check --show-trace && nix flake show
@@ -119,22 +118,26 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" |
   inputs.flake-utils.url       = "github:numtide/flake-utils";
   outputs = { self, nixpkgs, flake-utils }:
     let
+      pname                    = "spine";
       version                  = "<<spine_version_set>>";
-      supportedSystems         = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"  ];
+      shell                    = ./shell.nix; # ./default.nix;
+      devEnv                   = ./shell.nix; # ./default.nix;
+      supportedSystems         = [ "x86_64-linux" ]; # [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
       forAllSystems            = nixpkgs.lib.genAttrs supportedSystems;
       nixpkgsFor               = forAllSystems (system: import nixpkgs { inherit system;  }); # nixpkgs instantiated for supported system types.
+      <<flake_phases_other_than_build>>
     in {
       packages = forAllSystems (system:
         let pkgs               = nixpkgsFor.${system};
         in with pkgs; {
           default = stdenv.mkDerivation {
-            pname              = "spine";
+            inherit pname;
             inherit version;
             meta.mainProgram   = "spine";
             executable         = true;
             src                = self;
-            #shell              = ./shell.nix; # ./default.nix;
-            #devEnv             = ./shell.nix; # ./default.nix;
+            inherit shell;
+            inherit devEnv;
             buildInputs        = [ sqlite ];
             nativeBuildInputs  = [ dub dmd ldc gdc gnumake ]; # [ dub dmd ]; [ dub ldc ]; [ dub gdc ];
             buildPhase = ''
@@ -149,14 +152,18 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" |
               dub build --compiler=$DC --build=$DC_ --combined --skip-registry=all
               runHook postBuild
             '';
-            <<flake_phases_other_than_build>>
+            inherit checkPhase;
+            inherit installPhase;
+            inherit postInstall;
           };
           spine-dmd = stdenv.mkDerivation {
-            pname              = "spine";
+            inherit pname;
             inherit version;
             meta.mainProgram   = "spine-dmd";
             executable         = true;
             src                = self;
+            inherit shell;
+            inherit devEnv;
             buildInputs        = [ sqlite ];
             nativeBuildInputs  = [ dub dmd gnumake ];
             buildPhase = ''
@@ -164,14 +171,18 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" |
               dub build --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all
               runHook postBuild
             '';
-            <<flake_phases_other_than_build>>
+            inherit checkPhase;
+            inherit installPhase;
+            inherit postInstall;
           };
           spine-ldc = stdenv.mkDerivation {
-            pname              = "spine";
+            inherit pname;
             inherit version;
             meta.mainProgram   = "spine-ldc";
             executable         = true;
             src                = self;
+            inherit shell;
+            inherit devEnv;
             buildInputs        = [ sqlite ];
             nativeBuildInputs  = [ dub ldc gnumake ];
             buildPhase = ''
@@ -179,14 +190,18 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" |
               dub build --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all
               runHook postBuild
             '';
-            <<flake_phases_other_than_build>>
+            inherit checkPhase;
+            inherit installPhase;
+            inherit postInstall;
           };
           spine-gdc = stdenv.mkDerivation {
-            pname              = "spine";
+            inherit pname;
             inherit version;
             meta.mainProgram   = "spine-gdc";
             executable         = true;
             src                = self;
+            inherit shell;
+            inherit devEnv;
             buildInputs        = [ sqlite ];
             nativeBuildInputs  = [ dub gdc gnumake ];
             buildPhase = ''
@@ -194,7 +209,9 @@ export PROG_VER_DECLARED="`cat ./views/version.txt | grep --color=never "enum" |
               dub build --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
               runHook postBuild
             '';
-            <<flake_phases_other_than_build>>
+            inherit checkPhase;
+            inherit installPhase;
+            inherit postInstall;
           };
           #vendorSha256 = "sha256-0Q00000000000000000000000000000000000000000=";
         });