movefasta/nix-ros-overlay
1
0
Fork 0
mirror of https://github.com/lopsided98/nix-ros-overlay.git synced 2025-07-13 21:50:38 +03:00
Code Activity

Apply yaml-cpp-vendor patch to all distros.

Browse source
This commit is contained in:
Ben Wolsieffer 2021-10-25 12:12:40 -04:00
parent 20efe114c6
commit 197126c8f6
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
distros/distro-overlay.nix
View file

@ -360,10 +360,20 @@ let
urdf = patchBoostPython rosSuper.urdf;
yaml-cpp-vendor = patchVendorUrl rosSuper.yaml-cpp-vendor {
yaml-cpp-vendor = (patchVendorUrl rosSuper.yaml-cpp-vendor {
url = "https://github.com/jbeder/yaml-cpp/archive/0f9a586ca1dc29c2ecb8dd715a315b93e3f40f79.zip";
sha256 = "1g45f71mk4gyca550177qf70v5cvavlsalmg7x8bi59j6z6f0mgz";
};
}).overrideAttrs ({
patches ? [], ...
}: {
patches = [
# Fix "CMake Error: Unknown argument -std=c++14 -w"
(self.fetchpatch {
url = "https://github.com/ros2/yaml_cpp_vendor/pull/24.patch";
sha256 = "0via2vcvx0r0w8n626n7ghljadd2apdqn0wcqygmgbd7dmvfr97h";
})
] ++ patches;
});
};
in self.lib.makeExtensible (rosSelf: self.rosPackages.lib.mergeOverlays [
base

12
distros/foxy/overrides.nix
View file

@ -30,16 +30,4 @@ rosSelf: rosSuper: with rosSelf.lib; {
url = "https://github.com/OGRECave/ogre/archive/v1.12.1.zip";
sha256 = "1iv6k0dwdzg5nnzw2mcgcl663q4f7p2kj7nhs8afnsikrzxxgsi4";
};
yaml-cpp-vendor = rosSuper.yaml-cpp-vendor.overrideAttrs ({
patches ? [], ...
}: {
patches = [
# Fix "CMake Error: Unknown argument -std=c++14 -w"
(self.fetchpatch {
url = "https://github.com/ros2/yaml_cpp_vendor/pull/24.patch";
sha256 = "0via2vcvx0r0w8n626n7ghljadd2apdqn0wcqygmgbd7dmvfr97h";
})
] ++ patches;
});
}