nix: improve packaging

Gepetto · Jan 17, 2025 · 523e78e · 523e78e
1 parent 6f113b9
commit 523e78e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/package.nix → default.nix b/package.nix → default.nix
@@ -1,12 +1,15 @@
 {
   cmake,
   lib,
+  pinocchio,
   pkg-config,
-  python3Packages,
+  pythonImportsCheckHook,
+  qpsolvers,
+  scipy,
   stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "toolbox-parallel-robots";
   version = "0-unstable-2024-30-09";
 
@@ -30,8 +33,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    pythonImportsCheckHook
   ];
-  propagatedBuildInputs = [ python3Packages.pinocchio ];
+  propagatedBuildInputs = [
+    pinocchio
+    qpsolvers
+    scipy
+  ];
+
+  doCheck = true;
+  pythonImportsCheck = [ "toolbox_parallel_robots" ];
 
   meta = {
     description = "Set of tools to work with robots with bilateral constraints";

diff --git a/flake.nix b/flake.nix
@@ -20,7 +20,7 @@
           devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
           packages = {
             default = self'.packages.toolbox-parallel-robots;
-            toolbox-parallel-robots = pkgs.python3Packages.toPythonModule (pkgs.callPackage ./package.nix { });
+            toolbox-parallel-robots = pkgs.python3Packages.callPackage ./default.nix { };
           };
         };
     };