movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-06-10 17:54:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

rviz-ogre-vendor: don't set dontFixCmake for newer distros

Browse source 
jazzy and newer don't install to /opt anymore (due to ament vendor
patching) so this shouldn't be needed.
This commit is contained in:
Ben Wolsieffer 2024-11-04 22:23:31 -05:00
parent ffc4fc8922
commit 653f6e81e2
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
distros/humble/overrides.nix
View file

@ -135,10 +135,13 @@ in with lib; {
'';
});
rviz-ogre-vendor = patchVendorUrl rosSuper.rviz-ogre-vendor {
rviz-ogre-vendor = (patchVendorUrl rosSuper.rviz-ogre-vendor {
url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip";
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
};
}).overrideAttrs ({ ... }: {
# Prevent replacing $out/opt/.. with $out/var/empty/..
dontFixCmake = true;
});
shared-queues-vendor = patchVendorUrl (patchVendorUrl rosSuper.shared-queues-vendor {
url = "https://github.com/cameron314/concurrentqueue/archive/8f65a8734d77c3cc00d74c0532efca872931d3ce.zip";

2
distros/iron/overrides.nix
View file

@ -110,6 +110,8 @@ in with lib; {
--replace-fail 'https://github.com/${ogre.owner}/${ogre.repo}/archive/${ogre.rev}.zip' ${lib.escapeShellArg ogreTar} \
--replace-fail c1b870955efddf539385094e9034e7f7 fcc1176585a7feb9f23c7900182a1f32
'';
# Prevent replacing $out/opt/.. with $out/var/empty/..
dontFixCmake = true;
});
shared-queues-vendor = patchVendorUrl (patchVendorUrl rosSuper.shared-queues-vendor {

5
distros/ros2-overlay.nix
View file

@ -211,11 +211,6 @@ rosSelf: rosSuper: with rosSelf.lib; {
'';
});
rviz-ogre-vendor = rosSuper.rviz-ogre-vendor.overrideAttrs ({ ... }: {
# Prevent replacing $out/opt/.. with $out/var/empty/..
dontFixCmake = true;
});
rviz2 = rosSuper.rviz2.overrideAttrs ({
nativeBuildInputs ? [], qtWrapperArgs ? [], postFixup ? "", meta ? {}, ...
}: {