Skip to content

Move jrl-cmakemodules to buildInputs #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Jun 15, 2026
Merged

Move jrl-cmakemodules to buildInputs #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f55dcc
treewide(jrl-cmakemodules): is a buildInputs
arntanguy Jun 15, 2026
f02180e
mesh-sampling: release v1.1.0
arntanguy Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkgs/3rd-party/imguizmo.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ stdenv.mkDerivation (_finalAttrs: {
hash = "sha256-JLwciNGo90vR5tsFB4z5JPvhCz38FhN9Ja/5+Ct6YPo=";
};

buildInputs = [
jrl-cmakemodules
];
nativeBuildInputs = [
cmake
jrl-cmakemodules
];
propagatedBuildInputs = [
imgui
Expand Down
4 changes: 3 additions & 1 deletion pkgs/mc-rtc/controllers/polytopeController/mc-dynamic-polytopes.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ stdenv.mkDerivation (_finalAttrs: {
hash = "";
};

buildInputs = [
jrl-cmakemodules
];
nativeBuildInputs = [
cmake
jrl-cmakemodules
];
propagatedBuildInputs = [
mc-rtc
Expand Down
6 changes: 4 additions & 2 deletions pkgs/mc-rtc/mc-mujoco/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@ stdenv.mkDerivation (_finalAttrs: {
hash = "sha256-GDJKEOyRjPF5eTpXA7x82K86fjLyx3N3eTt2ZSmcYv4=";
};

buildInputs = [ cli11 ];
buildInputs = [
cli11
jrl-cmakemodules
];
nativeBuildInputs = [
cmake
jrl-cmakemodules
makeWrapper
];
propagatedBuildInputs = [
Expand Down
4 changes: 3 additions & 1 deletion pkgs/mc-rtc/mc-rtc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,12 @@ in
else
"";

buildInputs = [
jrl-cmakemodules
];
nativeBuildInputs = [
cmake
pkg-config
jrl-cmakemodules
qt5.wrapQtAppsHook
python3Packages.distutils
python3Packages.pytest
Expand Down
31 changes: 18 additions & 13 deletions pkgs/mesh-sampling/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,35 @@
{
stdenv,
lib,
fetchgit,
fetchFromGitHub,
cmake,
jrl-cmakemodules,
gtest,
cli11,
qhull,
assimp,
cli11,
eigen,
libz,
}:

stdenv.mkDerivation {
pname = "mesh-sampling";
version = "1.0.0";
version = "1.1.0";

src =
# TODO: release mesh-sampling
fetchgit {
url = "https://github.com/jrl-umi3218/mesh_sampling";
# master
rev = "466064a4e9b7718b0b90922122c6aedd4867724a";
sha256 = "sha256-2e1Ctq/2lj2BNyxPH3VD+owYlURyIUq82D74y4nKPeg=";
};
src = fetchFromGitHub {
owner = "jrl-umi3218";
repo = "mesh_sampling";
tag = "v1.1.0";
hash = "sha256-hZ8v42g0+Kw0aQtOa9id8WQ/pwDMpn8QxxBXVXpPpJU=";
};

buildInputs = [
cli11
jrl-cmakemodules
];
nativeBuildInputs = [
cmake
cli11
gtest
];
# XXX why is libz dependency manually required here? Either qhull or assimp should bring it
propagatedBuildInputs = [
Expand All @@ -39,9 +43,10 @@ stdenv.mkDerivation {
"-DINSTALL_DOCUMENTATION=OFF"
];

doCheck = false;
doCheck = true;

meta = with lib; {
mainProgram = "mesh_sampling";
description = "Samplers to obtain pointclouds from CAD meshes ";
homepage = "https://github.com/jrl-umi3218/mesh_sampling";
license = licenses.bsd2;
Expand Down
4 changes: 3 additions & 1 deletion pkgs/spacevecalg/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ stdenv.mkDerivation {
hash = "sha256-fTKKj3m8cO4F46LlO7r8JeuWLhlyRcX7EblHroDYFkQ=";
};

buildInputs = [
jrl-cmakemodules
];
nativeBuildInputs = [
cmake
jrl-cmakemodules
pkg-config
doxygen
python3Packages.cython
Expand Down
4 changes: 3 additions & 1 deletion pkgs/tasks/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ stdenv.mkDerivation {
hash = "sha256-1XrRagwiMJwukbqPmlJCzp/Y11POdUdDIFjeZTCg3Ik=";
};

buildInputs = [
jrl-cmakemodules
];
nativeBuildInputs = [
cmake
jrl-cmakemodules
python3Packages.distutils
python3Packages.pytest
python3Packages.cython
Expand Down
4 changes: 3 additions & 1 deletion pkgs/tvm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ stdenv.mkDerivation {
sha256 = "sha256-qse7emorGWqoWlmzaHNdbDiHFXrVOo3oz8Fah4AYmL8=";
};

buildInputs = [
jrl-cmakemodules
];
nativeBuildInputs = [
cmake
jrl-cmakemodules
];
propagatedBuildInputs = [
eigen-qld
Expand Down
Loading