From 20efe114c64e309624070e5c37f92c219fa8eeab Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Mon, 25 Oct 2021 12:10:07 -0400 Subject: [PATCH] foxy: yaml-cpp-vendor: add upstream patch to fix build --- distros/foxy/overrides.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/distros/foxy/overrides.nix b/distros/foxy/overrides.nix index 5cd1040b9c..7f31f1b407 100644 --- a/distros/foxy/overrides.nix +++ b/distros/foxy/overrides.nix @@ -30,4 +30,16 @@ 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; + }); }