From 524bafb4088441c1906f89dd9f08da74e5e45e08 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 29 Sep 2020 01:09:44 -0400 Subject: [PATCH] melodic: apriltag: remove patch It didn't apply cleanly and upstream has added a workaround until the real fix gets released. --- distros/melodic/overrides.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/distros/melodic/overrides.nix b/distros/melodic/overrides.nix index b224fa5a1d..74d18ae215 100644 --- a/distros/melodic/overrides.nix +++ b/distros/melodic/overrides.nix @@ -2,18 +2,6 @@ self: # Distro package set rosSelf: rosSuper: with rosSelf.lib; { - apriltag = rosSuper.apriltag.overrideAttrs ({ - patches ? [], ... - }: { - patches = patches ++ [ - # Fix assumption that CMAKE_INSTALL_INCLUDEDIR is relative - (self.fetchpatch { - url = "https://github.com/lopsided98/apriltag/commit/a6a5da0c834f5091f141c2088c1985876d0f9faa.patch"; - sha256 = "0pjfp6qk2rsvy36gzag1ny511cl52l80r76blckn2p1rpi78i68a"; - }) - ]; - }); - cv-bridge = (patchBoostPython rosSuper.cv-bridge).overrideAttrs ({ patches ? [], propagatedBuildInputs ? [], ...