diff --git a/distros/humble/overrides.nix b/distros/humble/overrides.nix index 355949a659..a6b54aa131 100644 --- a/distros/humble/overrides.nix +++ b/distros/humble/overrides.nix @@ -277,80 +277,4 @@ in with lib; { }) ]; }); - - zenoh-bridge-dds = rosSuper.zenoh-bridge-dds.overrideAttrs ({ - nativeBuildInputs ? [], pname ? "", postPatch ? "", src ? "", version ? "", ... - }: { - nativeBuildInputs = nativeBuildInputs ++ [ - self.rustPlatform.cargoSetupHook - self.cargo - self.rustc - ]; - postPatch = postPatch + '' - ln -s zenoh-bridge-dds/Cargo.lock Cargo.lock - ''; - cargoDeps = self.rustPlatform.fetchCargoVendor { - inherit pname version src; - hash = "sha256-DRMuF6DNLbMIA1CmhVZ7L//EuTCQNL5/lU6d+3DKnO4="; - prePatch = '' - cd zenoh-bridge-dds - ''; - }; - env.LIBCLANG_PATH = "${lib.getLib self.llvmPackages.libclang}/lib"; - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-conversion" - ]; - }); - - zenoh-cpp-vendor = let - zenoh-c-url = "https://github.com/eclipse-zenoh/zenoh-c.git"; - zenoh-c-rev = "5fce7fb1d397e016ad02a50bde4262007d755424"; - zenoh-c-hash = "sha256-jayvCq4xvvAheeSpmxwg1VA3TLPyS4QGdVhte8wk0KA="; - zenoh-cpp-url = "https://github.com/eclipse-zenoh/zenoh-cpp"; - zenoh-cpp-rev = "bd4d741c6c4fa6509d8d745e22c3c50b4306bd65"; - zenoh-cpp-hash = "sha256-OLNlew4pOLl1PRWrJTTfDv7LGYHGX0A7A4RW9jwCOsE="; - in (lib.patchAmentVendorGit (lib.patchAmentVendorGit rosSuper.zenoh-cpp-vendor { - url = zenoh-cpp-url; - rev = zenoh-cpp-rev; - fetchgitArgs.hash = zenoh-cpp-hash; - }) { - url = zenoh-c-url; - rev = zenoh-c-rev; - fetchgitArgs.hash = zenoh-c-hash; - }).overrideAttrs ({ - nativeBuildInputs ? [], postPatch ? "", ... - }: let - zenoh-c-source = self.fetchFromGitHub { - owner = "eclipse-zenoh"; - repo = "zenoh-c"; - rev = zenoh-c-rev; - hash = zenoh-c-hash; - }; - in { - nativeBuildInputs = nativeBuildInputs ++ [ - self.rustPlatform.cargoSetupHook - self.cargo - self.rustc - ]; - postPatch = postPatch + '' - ln -s ${zenoh-c-source.outPath}/Cargo.lock Cargo.lock - echo "set(ZENOH-C-VENDOR $(awk '/ament_vendor\(zenoh_c_vendor/,/VCS_VERSION/ {if (/VCS_VERSION/) print $2}' CMakeLists.txt))" >> CMakeLists.txt - echo "set(ZENOH-CPP-VENDOR $(awk '/ament_vendor\(zenoh_cpp_vendor/,/VCS_VERSION/ {if (/VCS_VERSION/) print $2}' CMakeLists.txt))" >> CMakeLists.txt - - cat >> CMakeLists.txt <<'EOF' - if(NOT ''${ZENOH-CPP-VENDOR} STREQUAL "${zenoh-cpp-rev}") - message(FATAL_ERROR "Mismatch in VCS_VERSION for zenoh_cpp_vendor (Nix: ${zenoh-cpp-rev}, upstream: ''${ZENOH-CPP-VENDOR}) Fix this in overrides.nix.") - endif() - if(NOT ''${ZENOH-C-VENDOR} STREQUAL "${zenoh-c-rev}") - message(FATAL_ERROR "Mismatch in VCS_VERSION for zenoh_c_vendor (Nix: ${zenoh-c-rev}, upstream: ''${ZENOH-C-VENDOR}) Fix this in overrides.nix.") - endif() - EOF - ''; - cargoDeps = self.rustPlatform.importCargoLock { - lockFile = "${zenoh-c-source.outPath}/Cargo.lock"; - outputHashes = { - "zenoh-1.2.0" = "sha256-0E03X0ZjZNJr7FgqnbjXCM6gKKezSSFSC0HfAq7WhM4="; - }; - }; - }); }