Skip to content

Commit

Permalink
Merge pull request #14 from Gepetto/gv-devel
Browse files Browse the repository at this point in the history
gepetto-viewer devel
  • Loading branch information
MaximilienNaveau authored Jan 14, 2025
2 parents 3c6d2cb + 0d5769f commit eb5617a
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 1 deletion.
66 changes: 66 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 22 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@
url = "https://github.com/nim65s/nixpkgs/pull/2.patch";
flake = false;
};

# hpp-tutorial needs PR2 robot in example-robot-data
# which is available in >= 4.2.0, which landed in master but not yet on nix-ros
patch-example-robot-data = {
url = "https://github.com/NixOS/nixpkgs/pull/363802.patch";
flake = false;
};

# gepetto-viewer has a fix to understand AMENT_PREFIX_PATH in #239/devel
gepetto-viewer = {
url = "github:Gepetto/gepetto-viewer/devel";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =
{ nixpkgs, self, ... }@inputs:
Expand All @@ -18,8 +31,16 @@
let
pkgs = import ./patched-nixpkgs.nix {
inherit nixpkgs system;
overlays = [ inputs.nix-ros-overlay.overlays.default ];
overlays = [
inputs.nix-ros-overlay.overlays.default
(_super: prev: {
gepetto-viewer = prev.gepetto-viewer.overrideAttrs {
inherit (inputs.gepetto-viewer.packages.${system}.gepetto-viewer) src;
};
})
];
patches = [
inputs.patch-example-robot-data
inputs.patch-hpp
];
};
Expand Down

0 comments on commit eb5617a

Please sign in to comment.