2 files changed, 58 insertions, 41 deletions

diff --git a/flake.nix b/flake.nix
index 3505d12..837785f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,17 +25,8 @@
           default = pkgs.mkShell {
             name = "dev";
 
-            buildInputs = with pkgs; [
-              jq
-              highs
-              cjson
-              uthash
-              nix-eval-jobs
-
-              pkg-config
-              meson
-              ninja
-
+            inputsFrom = [ self.packages.${system}.evanix ];
+            packages = with pkgs; [
               gdb
               ccls
               valgrind
@@ -55,36 +46,7 @@
         { system, pkgs }:
         {
           default = self.packages.${system}.evanix;
-          evanix = pkgs.stdenv.mkDerivation (finalAttrs: {
-            name = "evanix";
-
-            src = ./.;
-            nativeBuildInputs = with pkgs; [
-              uthash
-              meson
-              ninja
-              pkg-config
-              makeWrapper
-            ];
-            buildInputs = with pkgs; [
-              cjson
-              highs
-            ];
-
-            mesonFlags = [
-              (lib.mesonOption "NIX_EVAL_JOBS_PATH" (lib.getExe pkgs.nix-eval-jobs))
-            ];
-
-            meta = {
-              homepage = "https://git.sinanmohd.com/evanix";
-
-              license = lib.licenses.gpl3;
-              platforms = supportedSystems;
-              mainProgram = "evanix";
-
-              maintainers = with lib.maintainers; [ sinanmohd ];
-            };
-          });
+          evanix = pkgs.callPackage ./package.nix { };
 
           evanix-py = pkgs.python3Packages.callPackage ./python-package.nix { };
           pythonWithEvanix =
diff --git a/package.nix b/package.nix
new file mode 100644
index 0000000..6fa0b52
--- /dev/null
+++ b/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  cjson,
+  highs,
+  makeWrapper,
+  meson,
+  ninja,
+  nix-eval-jobs,
+  pkg-config,
+  stdenv,
+  uthash,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  name = "evanix";
+
+  src =
+    let
+      fs = lib.fileset;
+    in
+    fs.toSource {
+      root = ./.;
+      fileset = fs.unions [
+        ./src
+        ./tests
+        ./include
+        ./meson.build
+        ./meson_options.txt
+      ];
+    };
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    makeWrapper
+  ];
+  buildInputs = [
+    cjson
+    highs
+    uthash
+  ];
+
+  doCheck = true;
+
+  mesonFlags = [ (lib.mesonOption "NIX_EVAL_JOBS_PATH" (lib.getExe nix-eval-jobs)) ];
+
+  meta = {
+    homepage = "https://git.sinanmohd.com/evanix";
+
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
+    mainProgram = "evanix";
+
+    maintainers = with lib.maintainers; [ sinanmohd ];
+  };
+})