From 3d5b5aa2455706adaa0bd7209530641f9ca3fe50 Mon Sep 17 00:00:00 2001
From: xenia <xenia@awoo.systems>
Date: Wed, 17 Apr 2024 16:04:26 -0400
Subject: [PATCH] refactor nix

---
 default.nix     |  2 --
 nix/package.nix | 45 ---------------------------------------------
 package.nix     | 37 +++++++++++++++++++++++++++++++++++++
 shell.nix       |  2 --
 4 files changed, 37 insertions(+), 49 deletions(-)
 delete mode 100644 default.nix
 delete mode 100644 nix/package.nix
 create mode 100644 package.nix
 delete mode 100644 shell.nix

diff --git a/default.nix b/default.nix
deleted file mode 100644
index 83834f8..0000000
--- a/default.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-(pkgs.ocamlPackages.callPackage ./nix/package.nix {}).package
diff --git a/nix/package.nix b/nix/package.nix
deleted file mode 100644
index f0bcb17..0000000
--- a/nix/package.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  mkShell,
-
-  buildDunePackage,
-  eio,
-  eio_main,
-
-  ocaml,
-  dune_3,
-  odoc,
-  utop
-}:
-
-{
-  package =
-    let
-      sourceRoot = ../.;
-      fs = lib.fileset;
-      sourceFiles = fs.difference
-        (fs.gitTracked sourceRoot)
-        (fs.fileFilter (file: file.hasExt "nix") sourceRoot);
-      sourceSet = fs.toSource { root = sourceRoot; fileset = sourceFiles; };
-    in buildDunePackage rec {
-      pname = "bk910x";
-      version = "devel";
-      src = sourceSet;
-
-      minimalOCamlVersion = "5.1";
-      dontStrip = true;
-
-      propagatedBuildInputs = [ eio eio_main ];
-    };
-
-  shell = mkShell {
-    nativeBuildInputs = [
-      # base
-      ocaml dune_3 odoc
-      # shell
-      utop
-      # package deps
-      eio eio_main
-    ];
-  };
-}
diff --git a/package.nix b/package.nix
new file mode 100644
index 0000000..8f5341e
--- /dev/null
+++ b/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  mkShell,
+
+  buildDunePackage,
+  eio,
+  eio_main,
+
+  ocaml,
+  dune_3,
+  odoc,
+  utop,
+
+  enableShell ? false
+}:
+
+let
+  sourceRoot = ./.;
+  fs = lib.fileset;
+  sourceFiles = fs.difference
+    (fs.gitTracked sourceRoot)
+    (fs.fileFilter (file: file.hasExt "nix") sourceRoot);
+  sourceSet = fs.toSource { root = sourceRoot; fileset = sourceFiles; };
+in buildDunePackage rec {
+  pname = "bk910x";
+  version = "devel";
+  src = sourceSet;
+
+  minimalOCamlVersion = "5.1";
+  dontStrip = true;
+
+  propagatedBuildInputs = [ eio eio_main ];
+
+  nativeBuildInputs = lib.optionals enableShell [
+    ocaml dune_3 odoc utop
+  ];
+}
diff --git a/shell.nix b/shell.nix
deleted file mode 100644
index f0f6a51..0000000
--- a/shell.nix
+++ /dev/null
@@ -1,2 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-(pkgs.ocamlPackages.callPackage ./nix/package.nix {}).shell