From 16532cbf2a360b8ffa47d7b72dab2b204a912153 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Mon, 6 May 2024 14:14:49 -0400
Subject: work on more generic install + instructions

---
 flake.nix | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 8ce9b66..495e86c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,7 +49,7 @@
       pkgs-ovl = pkgsForSystem system;
       pkgs-nix = nixpkgsFor.${system};
     in
-      with pkgs-ovl; {
+      with pkgs-nix; {
         default = stdenv.mkDerivation {
           inherit pname;
           inherit version;
@@ -88,8 +88,8 @@
           src = self;
           inherit shell;
           inherit devEnv;
-          buildInputs = with pkgs-nix; [sqlite];
-          nativeBuildInputs = with pkgs-nix; [dub dmd gnumake];
+          buildInputs = with pkgs-ovl; [sqlite];
+          nativeBuildInputs = with pkgs-ovl; [dub dmd gnumake];
           buildPhase = ''
             runHook preBuild
             buildCMD="dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
@@ -112,10 +112,10 @@
           inherit shell;
           inherit devEnv;
           buildInputs = with pkgs-nix; [sqlite];
-          nativeBuildInputs = with pkgs-nix; [dub ldc gnumake];
+          nativeBuildInputs = with pkgs-ovl; [dub ldc gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all"
+            buildCMD="dub build --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -134,8 +134,8 @@
           src = self;
           inherit shell;
           inherit devEnv;
-          buildInputs = [sqlite];
-          nativeBuildInputs = [dub dmd gnumake];
+          buildInputs = with pkgs-ovl; [sqlite];
+          nativeBuildInputs = with pkgs-ovl; [dub dmd gnumake];
           buildPhase = ''
             runHook preBuild
             buildCMD="dub build --cache=local --compiler=$(type -P dmd) --build=dmd --combined --skip-registry=all"
@@ -157,11 +157,11 @@
           src = self;
           inherit shell;
           inherit devEnv;
-          buildInputs = [sqlite];
-          nativeBuildInputs = [dub ldc gnumake];
+          buildInputs = with pkgs-ovl; [sqlite];
+          nativeBuildInputs = with pkgs-ovl; [dub ldc gnumake];
           buildPhase = ''
             runHook preBuild
-            buildCMD="dub build --cache=local --compiler=$(type -P ldc2) --build=ldc2 --combined --skip-registry=all"
+            buildCMD="dub build --cache=local --compiler=$(type -P ldmd2) --build=ldmd2 --combined --skip-registry=all"
             echo $buildCMD
             $buildCMD
             echo $buildCMD
@@ -180,8 +180,8 @@
         #  src = self;
         #  inherit shell;
         #  inherit devEnv;
-        #  buildInputs = [ sqlite ];
-        #  nativeBuildInputs = [ dub gdc gnumake ];
+        #  buildInputs = with pkgs-ovl; [ sqlite ];
+        #  nativeBuildInputs = with pkgs-ovl; [ dub gdc gnumake ];
         #  buildPhase = ''
         #    runHook preBuild
         #    dub build --cache=local --compiler=$(type -P gdc) --build=gdc --combined --skip-registry=all
@@ -204,16 +204,15 @@
       pkgs-ovl = pkgsForSystem system;
       pkgs-nix = nixpkgsFor.${system};
       shellHook = ''
-        export DFLAGS="-O2 -boundscheck=on"
         export Date=`date "+%Y%m%d"`
       '';
     in
-      with pkgs-ovl; {
+      with pkgs-nix; {
         dsh-overlay = mkShell {
           name = "spine base dev shell";
           inherit shell;
           inherit devEnv;
-          packages = [
+          packages = with pkgs-ovl; [
             ldc
             #dmd
             dub
@@ -226,7 +225,7 @@
           name = "spine base dev shell";
           inherit shell;
           inherit devEnv;
-          packages = with pkgs-nix; [
+          packages = [
             dmd
             dub
             gnumake
@@ -238,7 +237,7 @@
           name = "spine base dev shell";
           inherit shell;
           inherit devEnv;
-          packages = with pkgs-nix; [
+          packages = [
             ldc
             dub
             gnumake
@@ -250,7 +249,7 @@
           name = "spine base dev shell";
           inherit shell;
           inherit devEnv;
-          packages = [
+          packages = with pkgs-ovl; [
             dmd
             dub
             gnumake
@@ -262,7 +261,7 @@
           name = "spine base dev shell";
           inherit shell;
           inherit devEnv;
-          packages = [
+          packages = with pkgs-ovl; [
             ldc
             dub
             gnumake
-- 
cgit v1.2.3